diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 4f3a899..6193e94 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -163,6 +163,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 4f3a899..6193e94 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -163,6 +163,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 18efe9c..2d5ae0b 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -95,6 +95,7 @@ android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 4f3a899..6193e94 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -163,6 +163,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 18efe9c..2d5ae0b 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -95,6 +95,7 @@ android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 4f3a899..6193e94 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -163,6 +163,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 18efe9c..2d5ae0b 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -95,6 +95,7 @@ android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> + + + + + + + + + + + + + + + android:layout_height="200dp" + android:layout_gravity="bottom" + android:layout_marginHorizontal="@dimen/margin_10dp" + android:layout_marginBottom="80dp" + android:background="@drawable/bg_layout" + android:visibility="gone"> - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java index dd1b425..596d75f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -60,7 +60,6 @@ private CaseDetailPresenterImpl caseDetailPresenter; private CaseDetailBean.DataBean data = new CaseDetailBean.DataBean(); - private List urls = new ArrayList<>(); @Override public int initLayoutView() { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java index 56ab60c..2b8e79e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -46,7 +46,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.iceteck.silicompressorr.SiliCompressor; @@ -621,7 +620,8 @@ "2", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java index 7486473..3b62736 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadQuicklyActivity.java @@ -413,7 +413,8 @@ "1", "1", eorc, typeCode, typeDetailCode, gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0); } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java index 7d9ffc3..1c85b2b 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -6,7 +6,6 @@ import android.media.AudioManager; import android.media.MediaPlayer; import android.text.TextUtils; -import android.util.Log; import android.view.View; import android.widget.EditText; import android.widget.ImageView; @@ -45,7 +44,6 @@ import com.casic.dcms.utils.GlideLoadEngine; import com.casic.dcms.utils.ItemDecorationSpace; import com.casic.dcms.utils.OtherUtils; -import com.casic.dcms.utils.SaveKeyValues; import com.casic.dcms.utils.StringHelper; import com.casic.dcms.utils.ToastHelper; import com.luck.picture.lib.PictureSelector; @@ -555,9 +553,7 @@ return; } longitude = data.getDoubleExtra("longitude", 0); - Log.d(TAG, "longitude: " + longitude); latitude = data.getDoubleExtra("latitude", 0); - Log.d(TAG, "latitude: " + latitude); gridId = data.getStringExtra("gridId"); String community = data.getStringExtra("community"); String casePlace = data.getStringExtra("pos"); @@ -567,7 +563,6 @@ } else { casePlaceView.setText(casePlace); } - SaveKeyValues.removeKey("CommunityName"); break; default: break; @@ -575,8 +570,6 @@ } } - private static final String TAG = "CaseVerifyDetailActivit"; - @Override protected void onDestroy() { super.onDestroy(); diff --git a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java index 5dde493..5f0d8d6 100644 --- a/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/MapWatchViewActivity.java @@ -1,5 +1,6 @@ package com.casic.dcms.ui; +import android.location.Location; import android.view.View; import androidx.core.content.ContextCompat; @@ -7,6 +8,9 @@ import com.casic.dcms.R; import com.casic.dcms.base.BaseActivity; import com.casic.dcms.utils.Constant; +import com.casic.dcms.utils.LocationHelper; +import com.casic.dcms.utils.callback.ILocationListener; +import com.esri.arcgisruntime.geometry.Point; import com.esri.arcgisruntime.layers.ArcGISTiledLayer; import com.esri.arcgisruntime.mapping.ArcGISMap; import com.esri.arcgisruntime.mapping.Basemap; @@ -17,8 +21,9 @@ import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet; import butterknife.BindView; +import butterknife.OnClick; -public class MapWatchViewActivity extends BaseActivity { +public class MapWatchViewActivity extends BaseActivity implements View.OnClickListener { @BindView(R.id.watchMapTopLayout) QMUITopBarLayout watchMapTopLayout; @@ -59,42 +64,62 @@ @Override public void initEvent() { - QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); - sheetBuilder.setTitle("更多拓展业务") - .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) - .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) - .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + + } + + @OnClick({R.id.moveToLocalView, R.id.moreSelectionView}) + @Override + public void onClick(View v) { + switch (v.getId()) { + case R.id.moveToLocalView: + LocationHelper.obtainCurrentLocation(this, new ILocationListener() { @Override - public void onClick(QMUIBottomSheet dialog, View itemView) { - dialog.dismiss(); - int tag = (int) itemView.getTag(); - switch (tag) { - case 0: - - break; - case 1: - - break; - case 2: - - break; - case 3: - - break; - case 4: - - break; - default: - break; + public void onLocationGet(Location location) { + if (location != null) { + mapView.setViewpointCenterAsync(new Point(location.getLongitude(), location.getLatitude())); } } - }) - .setAddCancelBtn(true) - .setSkinManager(QMUISkinManager.defaultInstance(this)) - .build().show(); + }); + break; + case R.id.moreSelectionView: + QMUIBottomSheet.BottomGridSheetBuilder sheetBuilder = new QMUIBottomSheet.BottomGridSheetBuilder(this); + sheetBuilder.setTitle("更多拓展业务") + .addItem(R.drawable.ic_ludeng, "路灯", 0, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_huanwei, "环卫", 1, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cesuo, "公厕", 2, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_sanbao, "门前五包", 3, QMUIBottomSheet.BottomGridSheetBuilder.FIRST_LINE) + .addItem(R.drawable.ic_cheliang, "车辆", 4, QMUIBottomSheet.BottomGridSheetBuilder.SECOND_LINE) + .setOnSheetItemClickListener(new QMUIBottomSheet.BottomGridSheetBuilder.OnSheetItemClickListener() { + @Override + public void onClick(QMUIBottomSheet dialog, View itemView) { + dialog.dismiss(); + int tag = (int) itemView.getTag(); + switch (tag) { + case 0: + + break; + case 1: + + break; + case 2: + + break; + case 3: + + break; + case 4: + + break; + default: + break; + } + } + }) + .setAddCancelBtn(true) + .setSkinManager(QMUISkinManager.defaultInstance(this)) + .build().show(); + break; + } } protected void onResume() { diff --git a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java index 6a0a96d..dc5fc67 100644 --- a/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/ThreePackageUploadActivity.java @@ -228,8 +228,11 @@ return; } shopCaseSubmitPresenter.onReadyRetrofitRequest("0", "0", longitude, latitude, - "2", "1", gridId.substring(0, 6), gridId.substring(0, 9), - gridId, gridId, description, fieldIntro, + "2", "1", + gridId.substring(0, 6), + gridId.substring(0, 9), + gridId.substring(0, 12), + gridId, description, fieldIntro, StringHelper.reformatURL(mediaList), 0, 0, shopID, shopKeeper, phoneNumber); } diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java index 8365c68..e11fa17 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/handle/OvertimeCaseFragment.java @@ -5,7 +5,6 @@ import android.content.Intent; import android.os.Handler; import android.os.Message; -import android.util.Log; import androidx.annotation.NonNull; import androidx.recyclerview.widget.DividerItemDecoration; @@ -20,7 +19,6 @@ import com.casic.dcms.mvp.view.ICaseHandleListView; import com.casic.dcms.ui.CaseHandleDetailActivity; import com.casic.dcms.utils.ToastHelper; -import com.google.gson.Gson; import com.qmuiteam.qmui.widget.QMUIEmptyView; import com.scwang.smartrefresh.layout.SmartRefreshLayout; import com.scwang.smartrefresh.layout.api.RefreshLayout; @@ -88,8 +86,6 @@ }); } -// private static final String TAG = "OvertimeCaseFragment"; - @Override public void obtainCaseHandleList(CaseHandleBean resultBean) { // Log.d(TAG, "obtainOvertimeCaseList: " + new Gson().toJson(resultBean)); diff --git a/app/src/main/java/com/casic/dcms/utils/Constant.java b/app/src/main/java/com/casic/dcms/utils/Constant.java index f23faf4..3c301bc 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -61,6 +61,7 @@ public static final long FIVE_YEARS = 5L * 365 * 1000 * 60 * 60 * 24L; public static final int PERMISSIONS_CODE = 999; public static final int REQUEST_MAP_CODE = 9001; + public static final int REQUEST_REFRESH_CODE = 9002; public static final String IP_KEY = "BASE_IP"; public static final String LOGIN_OUT_ACTION = "loginOut"; diff --git a/app/src/main/res/drawable/ic_more.xml b/app/src/main/res/drawable/ic_more.xml new file mode 100644 index 0000000..aa71aad --- /dev/null +++ b/app/src/main/res/drawable/ic_more.xml @@ -0,0 +1,9 @@ + + + diff --git a/app/src/main/res/drawable/radio_selector.xml b/app/src/main/res/drawable/radio_selector.xml new file mode 100644 index 0000000..133ad72 --- /dev/null +++ b/app/src/main/res/drawable/radio_selector.xml @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_case_detail.xml b/app/src/main/res/layout/activity_case_detail.xml index 4f3a899..6193e94 100644 --- a/app/src/main/res/layout/activity_case_detail.xml +++ b/app/src/main/res/layout/activity_case_detail.xml @@ -163,6 +163,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> diff --git a/app/src/main/res/layout/activity_case_todo_detail.xml b/app/src/main/res/layout/activity_case_todo_detail.xml index 18efe9c..2d5ae0b 100644 --- a/app/src/main/res/layout/activity_case_todo_detail.xml +++ b/app/src/main/res/layout/activity_case_todo_detail.xml @@ -95,6 +95,7 @@ android:layout_marginStart="25dp" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" /> + + + + + + + + + + + + + + + android:layout_height="200dp" + android:layout_gravity="bottom" + android:layout_marginHorizontal="@dimen/margin_10dp" + android:layout_marginBottom="80dp" + android:background="@drawable/bg_layout" + android:visibility="gone"> - + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/include_case_base_layout_read_only.xml b/app/src/main/res/layout/include_case_base_layout_read_only.xml index 88b42de..97d8da4 100644 --- a/app/src/main/res/layout/include_case_base_layout_read_only.xml +++ b/app/src/main/res/layout/include_case_base_layout_read_only.xml @@ -130,6 +130,7 @@ android:layout_centerVertical="true" android:layout_toStartOf="@id/locationMapView" android:layout_toEndOf="@id/t" + android:gravity="end" android:textSize="@dimen/textFontSize" />