diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index fb54226..1c8be71 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index fb54226..1c8be71 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index c0ffa22..ec85422 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index fb54226..1c8be71 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index c0ffa22..ec85422 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index ae4e3e5..1c7f9d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index fb54226..1c8be71 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index c0ffa22..ec85422 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index ae4e3e5..1c7f9d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 2f49ad7..f6c43dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index 8ae7a48..c7cc129 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -58,7 +58,7 @@ public class CaseCheckDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = CaseCheckDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 959400e..7fd53a1 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseCheckedDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseCheckedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) @@ -76,12 +76,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("案卷详情").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 1).setOnClickListener(v -> finish()); } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index 01edc50..da201b3 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -35,7 +35,7 @@ public class CaseDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index 31495be..83f54ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -62,7 +62,7 @@ public class CaseHandleDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IUploadFileView, ICaseDetailHandleView { - private Context context = CaseHandleDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseTypeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index b626ee4..cafc4ac 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseHandledDetailActivity extends BaseActivity implements View.OnClickListener, ICaseDetailView { - private Context context = CaseHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java index ca2ff5c..bb665ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseOnMapActivity.java @@ -34,6 +34,7 @@ import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; @@ -287,7 +288,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_HANDLE); @@ -332,7 +333,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_VERIFY); @@ -363,7 +364,7 @@ } relatePointToCase(list, bean.getId(), lng, lat); - Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference()); + Point point = new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326)); pointList.add(point); } addPictureMarker(pointList, Constant.CASE_CHECK); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 3a047da..f89c05a 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -45,7 +45,7 @@ public class CaseTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICommonSentenceView, IUpdateSuperviseView { - private Context context = CaseTodoDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseOverTimeView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 5f4c1a2..7661a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -34,7 +34,7 @@ public class CaseTodoHandledDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseTodoHandledDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java index 03b5ac1..aa02a1c 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -45,7 +45,7 @@ public class CaseUploadPackageActivity extends BaseCaseActivity implements View.OnClickListener, IUploadFileView, ICaseSubmitView { - private Context context = CaseUploadPackageActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 7ead240..b8f97ec 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -34,7 +34,7 @@ public class CaseVerifiedDetailActivity extends BaseActivity implements ICaseDetailView, View.OnClickListener { - private Context context = CaseVerifiedDetailActivity.this; + private Context context = this; @BindView(R.id.topLayout) QMUITopBarLayout topLayout; @BindView(R.id.caseNumberView) diff --git a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java index 6895c2f..3cedbfe 100644 --- a/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ChangeShopInfoActivity.java @@ -46,7 +46,7 @@ IShopInfoChangeView { private static final String TAG = "ChangeShopInfoActivity"; - private Context context = ChangeShopInfoActivity.this; + private Context context = this; @BindView(R.id.shopView) TextView shopView; @BindView(R.id.communityNameView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java index 0b4b82a..0d7053a 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAdjustDetailActivity.java @@ -47,7 +47,7 @@ public class DeptAdjustDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, ICaseDetailHandleView { - private Context context = DeptAdjustDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java index 52b3df3..bd491c3 100644 --- a/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DeptAuthorizeDetailActivity.java @@ -51,7 +51,7 @@ public class DeptAuthorizeDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, ICaseNextNodeView, IHandleProcessView, ICaseDetailHandleView { - private Context context = DeptAuthorizeDetailActivity.this; + private Context context = this; @BindView(R.id.caseNumberView) TextView caseNumberView; @BindView(R.id.caseResourceView) diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index c732a47..8df892c 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -65,11 +65,10 @@ @Override public void initData() { String caseType = getIntent().getStringExtra("caseType"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -95,7 +94,7 @@ /** * [116.598359, 28.247870, 0.000000, NaN] SR: 4326 */ - Point point = new Point(lng, lat, mapView.getSpatialReference()); + Point point = new Point(lng, lat, SpatialReference.create(4326)); mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //添加普通小圆点Marker diff --git a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java index 8287387..441625b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageHandledDetailActivity.java @@ -26,6 +26,7 @@ public class PackageHandledDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView { + private static final String TAG = "PackageHandledDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; diff --git a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java index b3e36d6..1dec74b 100644 --- a/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PackageTodoDetailActivity.java @@ -60,6 +60,7 @@ public class PackageTodoDetailActivity extends BaseCaseActivity implements View.OnClickListener, ICaseDetailView, IUploadFileView, ICaseNextNodeView, ICaseDetailHandleView, IPackageDetailHandleView { + private static final String TAG = "PackageTodoDetail"; @BindView(R.id.caseNumberView) TextView caseNumberView; 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 60ba558..e927cc5 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -35,9 +35,11 @@ import com.casic.dcms.utils.ToastHelper; import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; +import com.esri.arcgisruntime.data.ServiceFeatureTable; import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; +import com.esri.arcgisruntime.layers.FeatureLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; import com.esri.arcgisruntime.mapping.BasemapStyle; @@ -62,10 +64,6 @@ import butterknife.BindView; import butterknife.OnClick; -import cn.bertsir.zbar.Qr.ScanResult; -import cn.bertsir.zbar.QrConfig; -import cn.bertsir.zbar.QrManager; -import cn.bertsir.zbar.view.ScanLineView; public class PublicToiletActivity extends BaseActivity implements View.OnClickListener, IUploadFileView, IPublicToiletView { @@ -86,8 +84,6 @@ TextView workContentView; @BindView(R.id.toiletIdView) TextView toiletIdView; - @BindView(R.id.startScanView) - ImageView startScanView; @BindView(R.id.showPictureView) TextView showPictureView; @BindView(R.id.takePictureView) @@ -141,11 +137,11 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); +// double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); +// Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); +// mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 +// //添加图片Marker +// addPictureMarker(point); String address = aMapLocation.getAddress(); if (TextUtils.isEmpty(address)) { @@ -160,7 +156,7 @@ } }, false); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(12000); + mapView.setViewpointScaleAsync(8000); ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 @@ -169,6 +165,13 @@ arcGISMap.setBasemap(basemap); mapView.setMap(arcGISMap); + //公厕图层 + ServiceFeatureTable featureTable = new ServiceFeatureTable(Constant.TOILET_SERVICE_URL + "/33"); + featureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); + FeatureLayer toiletLayer = new FeatureLayer(featureTable); + arcGISMap.getOperationalLayers().add(toiletLayer); + mapView.setMap(arcGISMap); + uploadImagePresenter = new UploadImagePresenterImpl(this); cleanToiletPresenter = new CleanToiletPresenterImpl(this); } @@ -197,44 +200,15 @@ graphicsOverlays.add(mGraphicsOverlay); } - @OnClick({R.id.removeToLocalView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.startScanView, R.id.takePictureView, R.id.signInButton}) + @OnClick({R.id.expandMapView, R.id.minusMapView, R.id.startTimeLayout, R.id.endTimeLayout, R.id.selectWorkLayout, R.id.obtainToiletIdLayout, R.id.takePictureView, R.id.signInButton}) @Override public void onClick(View v) { switch (v.getId()) { - case R.id.removeToLocalView: - OtherUtils.showLoadingDialog(this, "定位中，请稍后"); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { - - } - - @SuppressLint("SetTextI18n") - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation == null) { - locationStreetView.setText("定位失败"); - locationStreetView.setTextColor(Color.RED); - } else { - double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); - Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 1200);//标注到指定经纬度并放大地图显示 - //添加图片Marker - addPictureMarker(point); - - String address = aMapLocation.getAddress(); - if (TextUtils.isEmpty(address)) { - locationStreetView.setText(aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum()); - } else { - locationStreetView.setText(address); - } - locationStreetView.setTextColor(Color.BLUE); - } - OtherUtils.dismissLoadingDialog(); - } - }, true); + case R.id.expandMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 0.5); + break; + case R.id.minusMapView: + mapView.setViewpointScaleAsync(mapView.getMapScale() * 2); break; case R.id.startTimeLayout: new TimePickerDialog.Builder().setThemeColor(ContextCompat.getColor(this, R.color.mainThemeColor)) @@ -275,32 +249,6 @@ } }).build().show(); break; - case R.id.startScanView: - QrConfig qrConfig = new QrConfig.Builder().setTitleText("扫一扫") //设置Title文字 - .setShowLight(true) //显示手电筒按钮 - .setShowTitle(true) //显示Title - .setScanType(QrConfig.TYPE_ALL)//识别二维码和条形码 - .setShowAlbum(false) //显示从相册选择按钮 - .setCornerColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描框颜色 - .setLineColor(ContextCompat.getColor(this, R.color.mainThemeColor)) //设置扫描线颜色 - .setLineSpeed(QrConfig.LINE_MEDIUM) //设置扫描线速度 - .setDesText(null) //扫描框下文字 - .setShowDes(true) //是否显示扫描框下面文字 - .setPlaySound(true) //是否扫描成功后bi~的声音 - .setIsOnlyCenter(true) //是否只识别框中内容(默认为全屏识别) - .setTitleBackgroudColor(ContextCompat.getColor(this, R.color.mainThemeColor)) - .setTitleTextColor(Color.WHITE) //设置Title文字颜色 - .setScreenOrientation(QrConfig.SCREEN_PORTRAIT) //设置屏幕方式 - .setScanLineStyle(ScanLineView.style_hybrid) //扫描线样式 - .setShowVibrator(true) //是否震动提醒 - .create(); - QrManager.getInstance().init(qrConfig).startScan(this, new QrManager.OnScanResultCallback() { - @Override - public void onScanSuccess(ScanResult result) { - toiletIdView.setText(result.getContent()); - } - }); - break; case R.id.takePictureView: OtherUtils.takePicture(this); break; diff --git a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java index 5d95ad1..f9ab8ff 100644 --- a/app/src/main/java/com/casic/dcms/ui/WellListActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WellListActivity.java @@ -45,6 +45,7 @@ import java.util.List; import butterknife.BindView; +import butterknife.OnClick; public class WellListActivity extends BaseCaseActivity implements View.OnClickListener, IWellListView, IOptionWellView { @@ -84,36 +85,8 @@ protected void setupTopBarLayout() { StatusBarColorUtil.setColor(this, ContextCompat.getColor(this, R.color.mainThemeColor)); ImmersionBar.with(this).statusBarDarkFont(false).init(); - leftBackView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + leftBackView.setOnClickListener(v -> finish()); titleView.setText(setTitleName()); - rightImageView.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - int popupWidth = QMUIDisplayHelper.dp2px(context, 100); - ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); - QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { - @Override - public void onItemClick(AdapterView parent, View view, int position, long id) { - switch (position) { - case 0: - showBatchOptionDialog("布防", "1"); - break; - case 1: - showBatchOptionDialog("撤防", "0"); - break; - } - } - }).animStyle(QMUIPopup.ANIM_AUTO) - .shadowElevation(10, 1) - .radius(10) - .show(rightImageView); - } - }); } @Override @@ -196,7 +169,6 @@ return; } activity.showSingleOptionDialog(bfztName, activity.dataBeans.get(position).getId(), bfzt); - } }); } @@ -267,9 +239,29 @@ OtherUtils.dismissLoadingDialog(); } + @OnClick(R.id.rightImageView) @Override public void onClick(View v) { - + if (v.getId() == R.id.rightImageView) { + int popupWidth = QMUIDisplayHelper.dp2px(context, 100); + ArrayAdapter popupListAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, Constant.POPUP_OPTION_ITEMS); + QMUIPopups.listPopup(context, popupWidth, popupWidth * 2, popupListAdapter, new AdapterView.OnItemClickListener() { + @Override + public void onItemClick(AdapterView parent, View view, int position, long id) { + switch (position) { + case 0: + showBatchOptionDialog("布防", "1"); + break; + case 1: + showBatchOptionDialog("撤防", "0"); + break; + } + } + }).animStyle(QMUIPopup.ANIM_AUTO) + .shadowElevation(10, 1) + .radius(10) + .show(rightImageView); + } } @Override diff --git a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java index f0b9831..24d006f 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -70,12 +70,7 @@ protected void setupTopBarLayout() { topLayout.setTitle("查看位置").setTextColor(ContextCompat.getColor(this, R.color.white)); topLayout.setBackgroundColor(ContextCompat.getColor(this, R.color.mainThemeColor)); - topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - finish(); - } - }); + topLayout.addLeftImageButton(R.drawable.ic_left_white, 0).setOnClickListener(v -> finish()); } @Override @@ -83,12 +78,10 @@ userName = getIntent().getStringExtra("userName"); createTime = getIntent().getStringExtra("createTime"); toiletName = getIntent().getStringExtra("toiletName"); - lng = getIntent().getDoubleExtra("lng", 0); - lat = getIntent().getDoubleExtra("lat", 0); + lng = getIntent().getDoubleExtra("lng", Constant.DEFAULT_LNG); + lat = getIntent().getDoubleExtra("lat", Constant.DEFAULT_LAT); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(64000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); @@ -102,8 +95,8 @@ @SuppressLint("ClickableViewAccessibility") @Override public void initEvent() { - Point point = new Point(lng, lat, mapView.getSpatialReference()); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 + Point point = new Point(lng, lat, SpatialReference.create(4326)); + mapView.setViewpointCenterAsync(point, 64000);//标注到指定经纬度并放大地图显示 addPictureMarker(point); mapView.setOnTouchListener(new DefaultMapViewOnTouchListener(this, mapView) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java index a7bee54..698a890 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/LightOnMapFragment.java @@ -104,15 +104,13 @@ lightMapPresenter.onReadyRetrofitRequest(); mapView.setAttributionTextVisible(false);//去掉左下角属性标识 - mapView.setViewpointScaleAsync(3000); - ArcGISMap arcGISMap = new ArcGISMap(BasemapStyle.ARCGIS_STREETS); //创建底图、并设置底图图层 ArcGISTiledLayer baseLayer = new ArcGISTiledLayer(Constant.BASE_MAP_SERVICE_URL); Basemap basemap = new Basemap(baseLayer); arcGISMap.setBasemap(basemap); Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4326)); - mapView.setViewpointCenterAsync(point, 3000);//标注到指定经纬度并放大地图显示 + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 mapView.setMap(arcGISMap); //Marker相关Layer diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java index bb2a79d..5ff3838 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/PersonOnMapFragment.java @@ -27,6 +27,7 @@ import com.casic.dcms.utils.ToastHelper; import com.esri.arcgisruntime.concurrent.ListenableFuture; import com.esri.arcgisruntime.geometry.Point; +import com.esri.arcgisruntime.geometry.SpatialReference; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -193,7 +194,7 @@ personBean.setPersonDept(bean.getDeptName()); personBean.setPointTime(bean.getLastTimeFmt()); personBean.setOnLine(bean.isOnLine()); - personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), mapView.getSpatialReference())); + personBean.setPoint(new Point(Double.parseDouble(lng), Double.parseDouble(lat), SpatialReference.create(4326))); personBeans.add(personBean); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java index fb54226..1c8be71 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java index c0ffa22..ec85422 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/overtime/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java index ae4e3e5..1c7f9d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseHandledFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java index 2f49ad7..f6c43dc 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/urgent/CaseTodoFragment.java @@ -91,7 +91,7 @@ } /** - * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateSuperviseData(ActionResultBean)}调用 + * 供{@link com.casic.dcms.ui.CaseTodoDetailActivity#obtainUpdateData(ActionResultBean)}调用 */ public static void sendEmptyMessage(int what) { if (weakReferenceHandler == null) { diff --git a/app/src/main/res/layout/activity_toilet.xml b/app/src/main/res/layout/activity_toilet.xml index c37ccf2..d52afd5 100644 --- a/app/src/main/res/layout/activity_toilet.xml +++ b/app/src/main/res/layout/activity_toilet.xml @@ -22,16 +22,35 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:layout_gravity="end|center_vertical" + android:layout_marginEnd="@dimen/margin_10dp" + android:orientation="vertical"> + + + + + + android:layout_weight="1.25"> - + + style="@style/rightImageStyle" + android:src="@drawable/ic_right" /> @@ -185,8 +203,8 @@