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 3c1d767..c29bc54 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.Color; import android.location.Location; -import android.util.Log; import android.view.MotionEvent; import android.view.View; @@ -215,7 +214,7 @@ Map attributes = element.getAttributes(); shopList.add(attributes); } - Log.d(TAG, "shopList: " + gson.toJson(shopList)); +// Log.d(TAG, "shopList: " + gson.toJson(shopList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); 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 3c1d767..c29bc54 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.Color; import android.location.Location; -import android.util.Log; import android.view.MotionEvent; import android.view.View; @@ -215,7 +214,7 @@ Map attributes = element.getAttributes(); shopList.add(attributes); } - Log.d(TAG, "shopList: " + gson.toJson(shopList)); +// Log.d(TAG, "shopList: " + gson.toJson(shopList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); 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 8fb8fb5..4429532 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -79,8 +79,8 @@ ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); - if ("部件".equals(caseType)) {//部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + if ("部件".equals(caseType)) {//部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); 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 3c1d767..c29bc54 100644 --- a/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ArcGISMapActivity.java @@ -6,7 +6,6 @@ import android.content.Intent; import android.graphics.Color; import android.location.Location; -import android.util.Log; import android.view.MotionEvent; import android.view.View; @@ -215,7 +214,7 @@ Map attributes = element.getAttributes(); shopList.add(attributes); } - Log.d(TAG, "shopList: " + gson.toJson(shopList)); +// Log.d(TAG, "shopList: " + gson.toJson(shopList)); runOnUiThread(() -> { QMUIDialog.MenuDialogBuilder menuDialogBuilder = new QMUIDialog.MenuDialogBuilder(context); menuDialogBuilder.setTitle("请选择您要上报的部件"); 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 8fb8fb5..4429532 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -79,8 +79,8 @@ ServiceFeatureTable communityFeatureTable = new ServiceFeatureTable(Constant.BASE_MAP_SERVICE_URL + "/13"); communityFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer communityLayer = new FeatureLayer(communityFeatureTable); - if ("部件".equals(caseType)) {//部件点图层 (ID: 1) - ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/1"); + if ("部件".equals(caseType)) {//部件点图层 (ID: 0) + ServiceFeatureTable pointFeatureTable = new ServiceFeatureTable(Constant.COMPONENT_SERVICE_URL + "/0"); pointFeatureTable.setFeatureRequestMode(ServiceFeatureTable.FeatureRequestMode.ON_INTERACTION_NO_CACHE); FeatureLayer pointLayer = new FeatureLayer(pointFeatureTable); arcGISMap.getOperationalLayers().addAll(Arrays.asList(communityLayer, pointLayer)); diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java index ea9caa5..fa6581d 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitService.java @@ -102,6 +102,31 @@ @Field("bzminis") int bzminis); /** + * 五包上报 + */ + @FormUrlEncoded + @POST("/case/addAPP") + Observable submitShopCase(@Header("token") String token, + @Field("isNeedVerify") String isNeedVerify, + @Field("isNeedRevisit") String isNeedRevisit, + @Field("lng") String longitude, + @Field("lat") String latitude, + @Field("source") String source, + @Field("caseLevel") String caseLevel, + @Field("areaCode") String areaCode, + @Field("streetCode") String streetCode, + @Field("communityCode") String communityCode, + @Field("gridId") String gridId, + @Field("description") String description, + @Field("fieldintro") String fieldintro, + @Field("fileIdVerify") String fileIdVerify, + @Field("bzhours") int bzhours, + @Field("bzminis") int bzminis, + @Field("shopId") String shopId, + @Field("shopkeeperName") String shopkeeperName, + @Field("shopPhone") String shopPhone); + + /** * 退出登录 */ @GET("/user/logout") @@ -254,31 +279,6 @@ @Part MultipartBody.Part file); /** - * 五包上报 - */ - @FormUrlEncoded - @POST("/case/addAPP") - Observable submitShopCase(@Header("token") String token, - @Field("isNeedVerify") String isNeedVerify, - @Field("isNeedRevisit") String isNeedRevisit, - @Field("lng") String longitude, - @Field("lat") String latitude, - @Field("source") String source, - @Field("caseLevel") String caseLevel, - @Field("areaCode") String areaCode, - @Field("streetCode") String streetCode, - @Field("communityCode") String communityCode, - @Field("gridId") String gridId, - @Field("description") String description, - @Field("fieldintro") String fieldintro, - @Field("fileIdVerify") String fileIdVerify, - @Field("bzhours") int bzhours, - @Field("bzminis") int bzminis, - @Field("shopId") String shopId, - @Field("shopkeeperName") String shopkeeperName, - @Field("shopPhone") String shopPhone); - - /** * 处理待办分页查询 * isOvertime 否 String 是否超时,null-所有案卷,1-超时案卷 * isEmergent 否 String 是否紧急,null-所有案卷,1-紧急案卷 @@ -335,9 +335,9 @@ @FormUrlEncoded @POST("/devicePositionLog/positionUpload") Observable uploadDevicePosition(@Header("token") String token, - @Field("imei") String imei, - @Field("positionLat") String positionLat, - @Field("positionLng") String positionLng); + @Field("imei") String imei, + @Field("positionLat") String positionLat, + @Field("positionLng") String positionLng); /** * 获取流转下级节点