diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + @@ -17,233 +18,155 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + @@ -17,233 +18,155 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + @@ -17,233 +18,155 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml new file mode 100644 index 0000000..7ef6b28 --- /dev/null +++ b/app/src/main/res/layout/include_case_type.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + @@ -17,233 +18,155 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml new file mode 100644 index 0000000..7ef6b28 --- /dev/null +++ b/app/src/main/res/layout/include_case_type.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/line.xml b/app/src/main/res/layout/line.xml index fd99e01..bb84f75 100644 --- a/app/src/main/res/layout/line.xml +++ b/app/src/main/res/layout/line.xml @@ -2,4 +2,5 @@ \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index e57ba63..0e13bec 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ applicationId "com.casic.dcms" minSdkVersion 21 targetSdkVersion 30 - versionCode 17 - versionName "v1.0.0.9" + versionCode 18 + versionName "v1.0.0.10" ndk { abiFilters "armeabi", "armeabi-v7a", "x86_64", "x86" } 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 2146285..8ac4fce 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -28,6 +28,7 @@ import com.esri.arcgisruntime.data.QueryParameters; 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; @@ -108,33 +109,30 @@ mapView.setMap(arcGISMap); //设置定位点 - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { - @Override - public void onLocationGet(Location location) { +// LocationHelper.obtainCurrentLocation(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); +// } else { +// Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); +// addPictureMarker(point); +// mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 +// } +// } +// +// @Override +// public void onAMapLocationGet(AMapLocation aMapLocation) { +// +// } +// }, true); - } - - @Override - public void onAMapLocationGet(AMapLocation aMapLocation) { - if (aMapLocation != null) { - String address = aMapLocation.getAddress(); - if (address.equals("")) { - address = aMapLocation.getProvince() - + aMapLocation.getCity() + aMapLocation.getDistrict() - + aMapLocation.getStreet() + aMapLocation.getStreetNum(); - } - if (address.contains("崇仁")) { - Point point = new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync((point), 2800); - } else { - Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, mapView.getSpatialReference()); - addPictureMarker(point); - mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 - } - } - } - }, true); + //TODO 暂时先用默认点代替定位点 + Point point = new Point(Constant.DEFAULT_LNG, Constant.DEFAULT_LAT, SpatialReference.create(4490)); + addPictureMarker(point); + mapView.setViewpointCenterAsync(point, 2800);//标注到指定经纬度并放大地图显示 //网格和社区 (ID: 13) ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); @@ -430,18 +428,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 58d9b09..c21eb80 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadPackageActivity.java @@ -50,8 +50,8 @@ private Context context = CaseUploadPackageActivity.this; @BindView(R.id.shopView) TextView shopView; - @BindView(R.id.communityView) - EditText communityView; + @BindView(R.id.communityNameView) + EditText communityNameView; @BindView(R.id.longitudeView) TextView longitudeView; @BindView(R.id.latitudeView) @@ -197,7 +197,7 @@ longitudeView.setText(String.valueOf(longitude)); latitudeView.setText(String.valueOf(latitude)); - communityView.setText(community); + communityNameView.setText(community); shopView.setText(shopName); break; default: 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 bd73cee..60d40ef 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -16,6 +16,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -142,18 +143,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; 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 f34ada1..01422e1 100644 --- a/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/WorkerOnMapActivity.java @@ -24,6 +24,7 @@ import com.casic.dcms.utils.callback.ILocationListener; 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; @@ -208,18 +209,20 @@ break; case R.id.removeToLocalView: loadingDialog.show(); - LocationHelper.obtainCurrentLocationByGD(this, new ILocationListener() { + LocationHelper.obtainCurrentLocation(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) { - mapView.setViewpointCenterAsync(new Point(aMapLocation.getLongitude(), aMapLocation.getLatitude(), mapView.getSpatialReference()), 1000); - loadingDialog.dismiss(); - } + } }, true); break; diff --git a/app/src/main/res/drawable/ic_left_white.xml b/app/src/main/res/drawable/ic_left_white.xml index 5487d77..4269f97 100644 --- a/app/src/main/res/drawable/ic_left_white.xml +++ b/app/src/main/res/drawable/ic_left_white.xml @@ -5,5 +5,5 @@ android:viewportHeight="1024"> + android:pathData="M736,896a32,32 0,0 1,-19.52 -6.66l-448,-344.19a31.87,31.87 0,0 1,-0.51 -50.3l448,-359.81a32,32 0,0 1,40.13 49.92L339.84,519.3l415.68,319.36A32,32 0,0 1,736 896z" /> diff --git a/app/src/main/res/drawable/ic_package_holder.xml b/app/src/main/res/drawable/ic_package_holder.xml index c2c6ae6..1f5ad5e 100644 --- a/app/src/main/res/drawable/ic_package_holder.xml +++ b/app/src/main/res/drawable/ic_package_holder.xml @@ -4,234 +4,27 @@ android:viewportWidth="1024" android:viewportHeight="1024"> + android:fillColor="#EAEAEA" + android:pathData="M496,124.61L96,524.58V1024h832V556.58z" /> + android:fillColor="#d2b48c" + android:pathData="M256,672h224v352H256z" /> + android:fillColor="#50CDFB" + android:pathData="M544,640h96v96h-96zM672,640h96v96h-96zM672,512h96v96h-96zM544,512h96v96h-96z" /> + android:fillColor="#1296db" + android:pathData="M544,512h96v32h-96zM672,512h96v32h-96zM544,640h96v32h-96zM672,640h96v32h-96z" /> + android:fillColor="#1296db" + android:pathData="M496,64L96,480v96L496,176 928,608v-96z" /> + android:fillColor="#50CDFB" + android:pathData="M1012.58,505.38L541.25,34.05l-22.62,-22.62a31.97,31.97 0,0 0,-45.25 0l-22.62,22.62L11.42,473.38a31.97,31.97 0,0 0,0 45.25l22.62,22.62a31.97,31.97 0,0 0,45.25 0L496,124.61l448.67,448.67a31.97,31.97 0,0 0,45.25 0l22.62,-22.62a32.03,32.03 0,0 0,0.03 -45.28z" /> + android:fillColor="#50CDFB" + android:pathData="M238.24,1024A126.66,126.66 0,0 0,256 960a128,128 0,0 0,-256 0c0,23.42 6.75,45.09 17.76,64h220.48zM896,832a127.74,127.74 0,0 0,-116.22 75.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h360.38A126.94,126.94 0,0 0,1024 960a128,128 0,0 0,-128 -128z" /> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:fillColor="#00ff7f" + android:pathData="M779.78,907.04A94.85,94.85 0,0 0,736 896a96,96 0,0 0,-96 96c0,11.3 2.3,21.95 5.89,32h139.87A126.66,126.66 0,0 1,768 960c0,-18.94 4.38,-36.77 11.78,-52.96z" /> diff --git a/app/src/main/res/layout/activity_case_handled_detail.xml b/app/src/main/res/layout/activity_case_handled_detail.xml index a7c4334..ed203bc 100644 --- a/app/src/main/res/layout/activity_case_handled_detail.xml +++ b/app/src/main/res/layout/activity_case_handled_detail.xml @@ -128,7 +128,7 @@ @@ -19,350 +19,168 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + @@ -18,257 +18,76 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + - + @@ -17,233 +18,155 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + - + - + - - + - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_type.xml b/app/src/main/res/layout/include_case_type.xml new file mode 100644 index 0000000..7ef6b28 --- /dev/null +++ b/app/src/main/res/layout/include_case_type.xml @@ -0,0 +1,99 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/line.xml b/app/src/main/res/layout/line.xml index fd99e01..bb84f75 100644 --- a/app/src/main/res/layout/line.xml +++ b/app/src/main/res/layout/line.xml @@ -2,4 +2,5 @@ \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 68f0a12..8936f98 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -8,6 +8,15 @@ @color/colorAccent + +