diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } 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 bf66d7a..ad070ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -37,6 +37,7 @@ import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; 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; @@ -146,7 +147,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); @@ -226,7 +228,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } 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 bf66d7a..ad070ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -37,6 +37,7 @@ import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; 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; @@ -146,7 +147,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); @@ -226,7 +228,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); 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 01422e1..050b443 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -209,20 +209,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } 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 bf66d7a..ad070ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -37,6 +37,7 @@ import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; 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; @@ -146,7 +147,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); @@ -226,7 +228,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); 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 01422e1..050b443 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -209,20 +209,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index c69557a..e2e4bb6 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -28,8 +28,11 @@ import java.util.Iterator; public class LocationHelper { - private static final String TAG = "LocationHelper"; + private static final double pi = 3.14159265358979324; + private static final double a = 6378245.0; // a: 卫星椭球坐标投影到平面地图坐标系的投影因子。 + private static final double ee = 0.00669342162296594323; // ee: 椭球的偏心率平方。 + /** * 高德sdk定位 @@ -132,4 +135,46 @@ } }); } + + /** + * check if the point in china + * 72.004 <= lng <= 137.8347 and 0.8293 <= lat <= 55.8271 + */ + private static boolean isOutOfChina(double lng, double lat) { + if (lng < 72.004 || lng > 137.8347) { + return lat < 0.8293 || lat > 55.8271; + } + return false; + } + + public static double[] gcjToWgs(double gcjLng, double gcjLat) { + if (isOutOfChina(gcjLng, gcjLat)) { + return new double[]{gcjLng, gcjLat}; + } + double dLng = transformLon(gcjLng - 105.0, gcjLat - 35.0); + double dLat = transformLat(gcjLng - 105.0, gcjLat - 35.0); + double radLat = gcjLat / 180.0 * pi; + double sinLat = Math.sin(radLat); + sinLat = 1 - ee * sinLat * sinLat; + double sinLatSqrt = Math.sqrt(sinLat); + dLng = (dLng * 180.0) / (a / sinLatSqrt * Math.cos(radLat) * pi); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (sinLat * sinLatSqrt) * pi); + return new double[]{gcjLng - dLng, gcjLat - dLat}; + } + + private static double transformLon(double lng, double lat) { + double ret = 300.0 + lat + 2.0 * lng + 0.1 * lat * lat + 0.1 * lat * lng + 0.1 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lat * pi) + 40.0 * Math.sin(lat / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(lat / 12.0 * pi) + 300.0 * Math.sin(lat / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + + private static double transformLat(double lng, double lat) { + double ret = -100.0 + 2.0 * lat + 3.0 * lng + 0.2 * lng * lng + 0.1 * lat * lng + 0.2 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lng * pi) + 40.0 * Math.sin(lng / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(lng / 12.0 * pi) + 320 * Math.sin(lng * pi / 30.0)) * 2.0 / 3.0; + return ret; + } } diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } 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 bf66d7a..ad070ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -37,6 +37,7 @@ import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; 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; @@ -146,7 +147,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); @@ -226,7 +228,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); 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 01422e1..050b443 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -209,20 +209,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index c69557a..e2e4bb6 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -28,8 +28,11 @@ import java.util.Iterator; public class LocationHelper { - private static final String TAG = "LocationHelper"; + private static final double pi = 3.14159265358979324; + private static final double a = 6378245.0; // a: 卫星椭球坐标投影到平面地图坐标系的投影因子。 + private static final double ee = 0.00669342162296594323; // ee: 椭球的偏心率平方。 + /** * 高德sdk定位 @@ -132,4 +135,46 @@ } }); } + + /** + * check if the point in china + * 72.004 <= lng <= 137.8347 and 0.8293 <= lat <= 55.8271 + */ + private static boolean isOutOfChina(double lng, double lat) { + if (lng < 72.004 || lng > 137.8347) { + return lat < 0.8293 || lat > 55.8271; + } + return false; + } + + public static double[] gcjToWgs(double gcjLng, double gcjLat) { + if (isOutOfChina(gcjLng, gcjLat)) { + return new double[]{gcjLng, gcjLat}; + } + double dLng = transformLon(gcjLng - 105.0, gcjLat - 35.0); + double dLat = transformLat(gcjLng - 105.0, gcjLat - 35.0); + double radLat = gcjLat / 180.0 * pi; + double sinLat = Math.sin(radLat); + sinLat = 1 - ee * sinLat * sinLat; + double sinLatSqrt = Math.sqrt(sinLat); + dLng = (dLng * 180.0) / (a / sinLatSqrt * Math.cos(radLat) * pi); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (sinLat * sinLatSqrt) * pi); + return new double[]{gcjLng - dLng, gcjLat - dLat}; + } + + private static double transformLon(double lng, double lat) { + double ret = 300.0 + lat + 2.0 * lng + 0.1 * lat * lat + 0.1 * lat * lng + 0.1 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lat * pi) + 40.0 * Math.sin(lat / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(lat / 12.0 * pi) + 300.0 * Math.sin(lat / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + + private static double transformLat(double lng, double lat) { + double ret = -100.0 + 2.0 * lat + 3.0 * lng + 0.2 * lng * lng + 0.1 * lat * lng + 0.2 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lng * pi) + 40.0 * Math.sin(lng / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(lng / 12.0 * pi) + 320 * Math.sin(lng * pi / 30.0)) * 2.0 / 3.0; + return ret; + } } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index e042128..b6849ae 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -14,21 +14,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:paddingVertical="@dimen/padding_10dp"> - + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java index 8ac4fce..99e1033 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -278,7 +278,7 @@ showShopDialog(featureBean.getBgid(), (String) feature.getAttributes().get("Note"), featureBean.getDutyname(), - String.valueOf(featureBean.getObjectid())); + String.valueOf(featureBean.getObjid())); } }); } @@ -428,20 +428,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java index 6ce7bd9..eaea1b6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseListResultActivity.java @@ -105,8 +105,8 @@ isRefresh = true; //刷新之后页码重置 pageIndex = 1; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); refreshLayout.setOnLoadMoreListener(new OnLoadMoreListener() { @@ -114,8 +114,8 @@ public void onLoadMore(@NonNull final RefreshLayout refreshLayout) { isLoadMore = true; pageIndex++; - caseListPresenter.onReadyRetrofitRequest(typeCode, typeDetailCode, caseState, startTime, - endTime, eorc, "0", pageIndex); + caseListPresenter.onReadyRetrofitRequest(eorc, typeCode, typeDetailCode, caseState, startTime, + endTime, "0", pageIndex); } }); } 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 60d40ef..0564332 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -143,20 +143,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/ui/MainActivity.java b/app/src/main/java/com/casic/dcms/ui/MainActivity.java index ad076f8..78b70d5 100644 --- a/app/src/main/java/com/casic/dcms/ui/MainActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MainActivity.java @@ -34,6 +34,7 @@ import com.casic.dcms.ui.fragment.NoticePageFragment; import com.casic.dcms.ui.fragment.PhonePageFragment; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; import com.casic.dcms.utils.NotificationHelper; import com.casic.dcms.utils.OtherUtils; import com.casic.dcms.utils.SaveKeyValues; @@ -217,8 +218,9 @@ case Constant.UPLOAD_LOCATION: AMapLocation aMapLocation = (AMapLocation) msg.obj; try { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); mainActivity.uploadPositionPresenter.onReadyRetrofitRequest(mainActivity.imei, - String.valueOf(aMapLocation.getLatitude()), String.valueOf(aMapLocation.getLongitude())); + String.valueOf(gcjToWgs[1]), String.valueOf(gcjToWgs[0])); } catch (NullPointerException e) { e.printStackTrace(); } 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 bf66d7a..ad070ae 100644 --- a/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/PublicToiletActivity.java @@ -37,6 +37,7 @@ import com.casic.dcms.utils.callback.ILocationListener; import com.casic.dcms.widgets.SignInDialog; 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; @@ -146,7 +147,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); @@ -226,7 +228,8 @@ locationStreetView.setText("定位失败"); locationStreetView.setTextColor(Color.RED); } else { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); + 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); 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 01422e1..050b443 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -209,20 +209,21 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocation(this, new ILocationListener() { + LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { @Override public void onLocationGet(Location location) { - if (location != null) { - Point point = new Point(location.getLongitude(), location.getLatitude(), SpatialReference.create(4490)); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - loadingDialog.dismiss(); - } + } @Override public void onAMapLocationGet(AMapLocation aMapLocation) { - + if (aMapLocation != null) { + double[] gcjToWgs = LocationHelper.gcjToWgs(aMapLocation.getLongitude(), aMapLocation.getLatitude()); + Point point = new Point(gcjToWgs[0], gcjToWgs[1], SpatialReference.create(4326)); + addPictureMarker(point); + mapView.setViewpointCenterAsync((point), 2800); + loadingDialog.dismiss(); + } } }, true); break; diff --git a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java index c69557a..e2e4bb6 100644 --- a/app/src/main/java/com/casic/dcms/utils/LocationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/LocationHelper.java @@ -28,8 +28,11 @@ import java.util.Iterator; public class LocationHelper { - private static final String TAG = "LocationHelper"; + private static final double pi = 3.14159265358979324; + private static final double a = 6378245.0; // a: 卫星椭球坐标投影到平面地图坐标系的投影因子。 + private static final double ee = 0.00669342162296594323; // ee: 椭球的偏心率平方。 + /** * 高德sdk定位 @@ -132,4 +135,46 @@ } }); } + + /** + * check if the point in china + * 72.004 <= lng <= 137.8347 and 0.8293 <= lat <= 55.8271 + */ + private static boolean isOutOfChina(double lng, double lat) { + if (lng < 72.004 || lng > 137.8347) { + return lat < 0.8293 || lat > 55.8271; + } + return false; + } + + public static double[] gcjToWgs(double gcjLng, double gcjLat) { + if (isOutOfChina(gcjLng, gcjLat)) { + return new double[]{gcjLng, gcjLat}; + } + double dLng = transformLon(gcjLng - 105.0, gcjLat - 35.0); + double dLat = transformLat(gcjLng - 105.0, gcjLat - 35.0); + double radLat = gcjLat / 180.0 * pi; + double sinLat = Math.sin(radLat); + sinLat = 1 - ee * sinLat * sinLat; + double sinLatSqrt = Math.sqrt(sinLat); + dLng = (dLng * 180.0) / (a / sinLatSqrt * Math.cos(radLat) * pi); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (sinLat * sinLatSqrt) * pi); + return new double[]{gcjLng - dLng, gcjLat - dLat}; + } + + private static double transformLon(double lng, double lat) { + double ret = 300.0 + lat + 2.0 * lng + 0.1 * lat * lat + 0.1 * lat * lng + 0.1 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lat * pi) + 40.0 * Math.sin(lat / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(lat / 12.0 * pi) + 300.0 * Math.sin(lat / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + + private static double transformLat(double lng, double lat) { + double ret = -100.0 + 2.0 * lat + 3.0 * lng + 0.2 * lng * lng + 0.1 * lat * lng + 0.2 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lng * pi) + 40.0 * Math.sin(lng / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(lng / 12.0 * pi) + 320 * Math.sin(lng * pi / 30.0)) * 2.0 / 3.0; + return ret; + } } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index e042128..b6849ae 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -14,21 +14,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:paddingVertical="@dimen/padding_10dp"> - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_search.xml b/app/src/main/res/layout/activity_case_search.xml index 0bf2de5..4a6470e 100644 --- a/app/src/main/res/layout/activity_case_search.xml +++ b/app/src/main/res/layout/activity_case_search.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/whiteSmoke" android:orientation="vertical"> - + - + + + android:orientation="vertical"> - + - - + - + - + + - + - + - - + - + - + + - + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + 137.8347) { + return lat < 0.8293 || lat > 55.8271; + } + return false; + } + + public static double[] gcjToWgs(double gcjLng, double gcjLat) { + if (isOutOfChina(gcjLng, gcjLat)) { + return new double[]{gcjLng, gcjLat}; + } + double dLng = transformLon(gcjLng - 105.0, gcjLat - 35.0); + double dLat = transformLat(gcjLng - 105.0, gcjLat - 35.0); + double radLat = gcjLat / 180.0 * pi; + double sinLat = Math.sin(radLat); + sinLat = 1 - ee * sinLat * sinLat; + double sinLatSqrt = Math.sqrt(sinLat); + dLng = (dLng * 180.0) / (a / sinLatSqrt * Math.cos(radLat) * pi); + dLat = (dLat * 180.0) / ((a * (1 - ee)) / (sinLat * sinLatSqrt) * pi); + return new double[]{gcjLng - dLng, gcjLat - dLat}; + } + + private static double transformLon(double lng, double lat) { + double ret = 300.0 + lat + 2.0 * lng + 0.1 * lat * lat + 0.1 * lat * lng + 0.1 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lat * pi) + 40.0 * Math.sin(lat / 3.0 * pi)) * 2.0 / 3.0; + ret += (150.0 * Math.sin(lat / 12.0 * pi) + 300.0 * Math.sin(lat / 30.0 * pi)) * 2.0 / 3.0; + return ret; + } + + private static double transformLat(double lng, double lat) { + double ret = -100.0 + 2.0 * lat + 3.0 * lng + 0.2 * lng * lng + 0.1 * lat * lng + 0.2 * Math.sqrt(Math.abs(lat)); + ret += (20.0 * Math.sin(6.0 * lat * pi) + 20.0 * Math.sin(2.0 * lat * pi)) * 2.0 / 3.0; + ret += (20.0 * Math.sin(lng * pi) + 40.0 * Math.sin(lng / 3.0 * pi)) * 2.0 / 3.0; + ret += (160.0 * Math.sin(lng / 12.0 * pi) + 320 * Math.sin(lng * pi / 30.0)) * 2.0 / 3.0; + return ret; + } } diff --git a/app/src/main/res/layout/activity_big_image.xml b/app/src/main/res/layout/activity_big_image.xml index e042128..b6849ae 100644 --- a/app/src/main/res/layout/activity_big_image.xml +++ b/app/src/main/res/layout/activity_big_image.xml @@ -14,21 +14,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - + android:paddingVertical="@dimen/padding_10dp"> - + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_case_search.xml b/app/src/main/res/layout/activity_case_search.xml index 0bf2de5..4a6470e 100644 --- a/app/src/main/res/layout/activity_case_search.xml +++ b/app/src/main/res/layout/activity_case_search.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/white" + android:background="@color/whiteSmoke" android:orientation="vertical"> - + - + + + android:orientation="vertical"> - + - - + - + - + + - + - + - - + - + - + + - + - + - - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + \ No newline at end of file