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 8ceeeda..6fe26b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -645,6 +645,9 @@ if (uploadAudioPresenter != null) { uploadAudioPresenter.disposeRetrofitRequest(); } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } if (mediaPlayer != null) { mediaPlayer.reset(); mediaPlayer.release(); 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 8ceeeda..6fe26b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -645,6 +645,9 @@ if (uploadAudioPresenter != null) { uploadAudioPresenter.disposeRetrofitRequest(); } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } if (mediaPlayer != null) { mediaPlayer.reset(); mediaPlayer.release(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index f612abf..fca4476 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; -import android.graphics.Color; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.location.Location; import android.view.View; @@ -23,7 +24,6 @@ import com.esri.arcgisruntime.mapping.view.GraphicsOverlay; import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; -import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -105,18 +105,9 @@ addPictureMarker(point); } - private void addSimpleMarker(Point point) { - SimpleMarkerSymbol simpleMarker = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(point, simpleMarker); - GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); - ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); - ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); - overlayGraphics.add(graphic); - graphicsOverlays.add(mGraphicsOverlay); - } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_case); + Bitmap caseBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.location_case); + BitmapDrawable caseDrawable = new BitmapDrawable(getResources(), caseBitmap); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); 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 8ceeeda..6fe26b0 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseUploadActivity.java @@ -645,6 +645,9 @@ if (uploadAudioPresenter != null) { uploadAudioPresenter.disposeRetrofitRequest(); } + if (uploadVideoPresenter != null) { + uploadVideoPresenter.disposeRetrofitRequest(); + } if (mediaPlayer != null) { mediaPlayer.reset(); mediaPlayer.release(); diff --git a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java index f612abf..fca4476 100644 --- a/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/DisplayMapActivity.java @@ -1,6 +1,7 @@ package com.casic.dcms.ui; -import android.graphics.Color; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.drawable.BitmapDrawable; import android.location.Location; import android.view.View; @@ -23,7 +24,6 @@ import com.esri.arcgisruntime.mapping.view.GraphicsOverlay; import com.esri.arcgisruntime.mapping.view.MapView; import com.esri.arcgisruntime.symbology.PictureMarkerSymbol; -import com.esri.arcgisruntime.symbology.SimpleMarkerSymbol; import com.esri.arcgisruntime.util.ListenableList; import com.qmuiteam.qmui.widget.QMUITopBarLayout; @@ -105,18 +105,9 @@ addPictureMarker(point); } - private void addSimpleMarker(Point point) { - SimpleMarkerSymbol simpleMarker = new SimpleMarkerSymbol(SimpleMarkerSymbol.Style.CIRCLE, Color.RED, 15); - Graphic graphic = new Graphic(point, simpleMarker); - GraphicsOverlay mGraphicsOverlay = new GraphicsOverlay(); - ListenableList overlayGraphics = mGraphicsOverlay.getGraphics(); - ListenableList graphicsOverlays = mapView.getGraphicsOverlays(); - overlayGraphics.add(graphic); - graphicsOverlays.add(mGraphicsOverlay); - } - private void addPictureMarker(Point point) { - BitmapDrawable caseDrawable = (BitmapDrawable) ContextCompat.getDrawable(this, R.mipmap.location_case); + Bitmap caseBitmap = BitmapFactory.decodeResource(getResources(), R.mipmap.location_case); + BitmapDrawable caseDrawable = new BitmapDrawable(getResources(), caseBitmap); PictureMarkerSymbol pictureMarker = new PictureMarkerSymbol(caseDrawable); pictureMarker.setHeight(24); pictureMarker.setWidth(24); diff --git a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java index 59fd47a..cfe5bfc 100644 --- a/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/NotificationHelper.java @@ -9,6 +9,7 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.BitmapFactory; +import android.media.AudioManager; import android.os.Build; import com.casic.dcms.R; @@ -18,10 +19,12 @@ @SuppressLint("StaticFieldLeak") private static NotificationHelper notificationHelper; private NotificationManager notificationManager; + private AudioManager audioManager; private NotificationHelper(Context context) { this.mContext = context; notificationManager = (NotificationManager) context.getSystemService(Context.NOTIFICATION_SERVICE); + audioManager = (AudioManager) context.getSystemService(Context.AUDIO_SERVICE); } /** @@ -44,7 +47,12 @@ String name = mContext.getResources().getString(R.string.app_name); //创建渠道 String id = name + "_DefaultChannel"; - NotificationChannel mChannel = new NotificationChannel(id, name, NotificationManager.IMPORTANCE_DEFAULT); + NotificationChannel mChannel = new NotificationChannel(id, name, NotificationManager.IMPORTANCE_HIGH); +// mChannel.setSound(Uri.parse(""), Notification.AUDIO_ATTRIBUTES_DEFAULT); +// mChannel.setShowBadge(true); +// mChannel.enableVibration(true); +// mChannel.setVibrationPattern(new long[]{100, 200, 300}); +// mChannel.setLockscreenVisibility(Notification.VISIBILITY_PUBLIC);//设置锁屏可见 notificationManager.createNotificationChannel(mChannel); builder = new Notification.Builder(mContext, id); } else { @@ -110,6 +118,15 @@ .setContentIntent(PendingIntent.getActivity(mContext, 0, intent, 0)) .setAutoCancel(true); Notification notification = builder.build(); + int ringerMode = audioManager.getRingerMode(); + if (ringerMode == 1) { + notification.defaults |= Notification.DEFAULT_VIBRATE;// 震动 + notification.vibrate = new long[]{0, 100, 200, 300}; + } + if (ringerMode == 2) { + notification.defaults |= Notification.DEFAULT_SOUND;// 声音 + } + notification.visibility = Notification.VISIBILITY_PUBLIC;//设置锁屏可见 notification.flags = Notification.FLAG_AUTO_CANCEL; return notification; }