diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; 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 5840276..3ee2612 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -60,7 +60,13 @@ public static final double DELTA_LNG_10 = 0.00002536; // 10米范围经度值偏移量（大约） public static final double DELTA_LAT_10 = 0.00002256;// 10米范围纬度值偏移量（大约） + //生产环境 public static final String BASE_MAP_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 public static final String BASE_MAP_NO_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 public static final String COMPONENT_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 + + //正是环境 +// public static final String BASE_MAP_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 +// public static final String BASE_MAP_NO_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 +// public static final String COMPONENT_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 } diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; 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 5840276..3ee2612 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -60,7 +60,13 @@ public static final double DELTA_LNG_10 = 0.00002536; // 10米范围经度值偏移量（大约） public static final double DELTA_LAT_10 = 0.00002256;// 10米范围纬度值偏移量（大约） + //生产环境 public static final String BASE_MAP_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 public static final String BASE_MAP_NO_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 public static final String COMPONENT_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 + + //正是环境 +// public static final String BASE_MAP_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 +// public static final String BASE_MAP_NO_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 +// public static final String COMPONENT_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 } diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 38b7ac8..1194333 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -89,6 +89,7 @@ if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; Log.d(TAG, "媒体路径: " + mediaPath); return mediaPath; } else { @@ -119,6 +120,7 @@ } else { String data = url.replace("\\", "/"); imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; } Log.d(TAG, "图片路径: " + imagePath); return imagePath; @@ -130,6 +132,7 @@ return url; } return SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + url; +// return SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + url; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; 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 5840276..3ee2612 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -60,7 +60,13 @@ public static final double DELTA_LNG_10 = 0.00002536; // 10米范围经度值偏移量（大约） public static final double DELTA_LAT_10 = 0.00002256;// 10米范围纬度值偏移量（大约） + //生产环境 public static final String BASE_MAP_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 public static final String BASE_MAP_NO_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 public static final String COMPONENT_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 + + //正是环境 +// public static final String BASE_MAP_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 +// public static final String BASE_MAP_NO_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 +// public static final String COMPONENT_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 } diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 38b7ac8..1194333 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -89,6 +89,7 @@ if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; Log.d(TAG, "媒体路径: " + mediaPath); return mediaPath; } else { @@ -119,6 +120,7 @@ } else { String data = url.replace("\\", "/"); imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; } Log.d(TAG, "图片路径: " + imagePath); return imagePath; @@ -130,6 +132,7 @@ return url; } return SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + url; +// return SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + url; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 3485bc2..f5dc11e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -54,6 +54,7 @@ private static Retrofit createRetrofit() { String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); +// String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401"); return new Retrofit.Builder() .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; 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 5840276..3ee2612 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -60,7 +60,13 @@ public static final double DELTA_LNG_10 = 0.00002536; // 10米范围经度值偏移量（大约） public static final double DELTA_LAT_10 = 0.00002256;// 10米范围纬度值偏移量（大约） + //生产环境 public static final String BASE_MAP_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 public static final String BASE_MAP_NO_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 public static final String COMPONENT_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 + + //正是环境 +// public static final String BASE_MAP_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 +// public static final String BASE_MAP_NO_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 +// public static final String COMPONENT_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 } diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 38b7ac8..1194333 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -89,6 +89,7 @@ if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; Log.d(TAG, "媒体路径: " + mediaPath); return mediaPath; } else { @@ -119,6 +120,7 @@ } else { String data = url.replace("\\", "/"); imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; } Log.d(TAG, "图片路径: " + imagePath); return imagePath; @@ -130,6 +132,7 @@ return url; } return SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + url; +// return SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + url; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 3485bc2..f5dc11e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -54,6 +54,7 @@ private static Retrofit createRetrofit() { String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); +// String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401"); return new Retrofit.Builder() .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml new file mode 100644 index 0000000..7ffc6c1 --- /dev/null +++ b/app/src/main/res/drawable/ic_copy.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java index e4cdbee..bc6bbca 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckDetailActivity.java @@ -339,7 +339,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java index 7c9c517..23f3260 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseCheckedDetailActivity.java @@ -244,7 +244,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 1d57528..e25aefd 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseDetailActivity.java @@ -218,7 +218,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java index aca2f2d..7455b6e 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandleDetailActivity.java @@ -225,7 +225,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java index 4880448..3079857 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseHandledDetailActivity.java @@ -188,7 +188,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java index 7d4a7d4..67621a8 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoDetailActivity.java @@ -217,7 +217,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java index 6b85509..7e88437 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseTodoHandledDetailActivity.java @@ -164,7 +164,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java index 723274c..8a155f6 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifiedDetailActivity.java @@ -167,7 +167,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); 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 ba13804..c30bd0f 100644 --- a/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java +++ b/app/src/main/java/com/casic/dcms/ui/CaseVerifyDetailActivity.java @@ -272,7 +272,7 @@ //视频 String videoFile = data.getVideoIdVerify(); - if (!TextUtils.isEmpty(audioFile)) { + if (!TextUtils.isEmpty(videoFile)) { videoPlayerView.setVisibility(View.VISIBLE); String videoUrl = StringHelper.appendCompleteURL(videoFile); videoPlayerView.setUp(videoUrl, StringHelper.filterString(data.getDescription())); diff --git a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java index 4e7a008..b57fe03 100644 --- a/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java +++ b/app/src/main/java/com/casic/dcms/ui/fragment/MinePageFragment.java @@ -1,6 +1,8 @@ package com.casic.dcms.ui.fragment; import android.app.ProgressDialog; +import android.content.ClipData; +import android.content.ClipboardManager; import android.content.ComponentName; import android.content.Context; import android.content.Intent; @@ -48,6 +50,8 @@ public class MinePageFragment extends BaseFragment implements View.OnClickListener, IUpdateVersionView, ILoginOutView { private static final String TAG = "MinePageFragment"; + @BindView(R.id.deviceIdView) + TextView deviceIdView; @BindView(R.id.versionCodeView) TextView versionCodeView; @BindView(R.id.autoLoginSwitch) @@ -62,6 +66,7 @@ private QMUITipDialog loadingDialog; private UpdatePresenterImpl updatePresenter; private ProgressDialog progressDialog; + private ClipboardManager clipboardManager; @Override protected int initLayoutView() { @@ -75,6 +80,7 @@ @Override protected void initData() { + deviceIdView.setText(OtherUtils.obtainSimCardSerialNumber(context)); versionCodeView.setText(BuildConfig.VERSION_NAME); loginOutPresenter = new LoginOutPresenterImpl(this); boolean isAutoLogin = (boolean) SaveKeyValues.getValue("autoLogin", false); @@ -84,6 +90,7 @@ .setTipWord("请求中，请稍后") .create(); updatePresenter = new UpdatePresenterImpl(this); + clipboardManager = (ClipboardManager) context.getSystemService(Context.CLIPBOARD_SERVICE); //下载进度条 progressDialog = new ProgressDialog(context); @@ -143,7 +150,7 @@ } - @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.updateVersionView, R.id.loginOutButton}) + @OnClick({R.id.userNameLayout, R.id.passwordLayout, R.id.helpfulLayout, R.id.copyView, R.id.updateVersionView, R.id.loginOutButton}) @Override public void onClick(View v) { switch (v.getId()) { @@ -156,6 +163,11 @@ case R.id.helpfulLayout: startActivity(new Intent(context, HelpfulActivity.class)); break; + case R.id.copyView: + ClipData clipData = ClipData.newPlainText("deviceId", deviceIdView.getText().toString()); + clipboardManager.setPrimaryClip(clipData); + ToastHelper.showToast("复制成功", ToastHelper.SUCCESS); + break; case R.id.updateVersionView: updatePresenter.onReadyRetrofitRequest(); break; 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 5840276..3ee2612 100644 --- a/app/src/main/java/com/casic/dcms/utils/Constant.java +++ b/app/src/main/java/com/casic/dcms/utils/Constant.java @@ -60,7 +60,13 @@ public static final double DELTA_LNG_10 = 0.00002536; // 10米范围经度值偏移量（大约） public static final double DELTA_LAT_10 = 0.00002256;// 10米范围纬度值偏移量（大约） + //生产环境 public static final String BASE_MAP_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 public static final String BASE_MAP_NO_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 public static final String COMPONENT_SERVICE_URL = "http://111.198.10.15:13002/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 + + //正是环境 +// public static final String BASE_MAP_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt/MapServer";//崇仁城管地图底图 +// public static final String BASE_MAP_NO_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crdt_1/MapServer";//崇仁城管地图不带网格底图 +// public static final String COMPONENT_SERVICE_URL = "http://223.82.47.232:11408/arcgis/rest/services/crbj/FeatureServer";//崇仁部件图层 } diff --git a/app/src/main/java/com/casic/dcms/utils/StringHelper.java b/app/src/main/java/com/casic/dcms/utils/StringHelper.java index 38b7ac8..1194333 100644 --- a/app/src/main/java/com/casic/dcms/utils/StringHelper.java +++ b/app/src/main/java/com/casic/dcms/utils/StringHelper.java @@ -89,6 +89,7 @@ if (url.endsWith(".m4a") || url.endsWith(".mp4")) { String data = url.replace("\\", "/"); String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// String mediaPath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; Log.d(TAG, "媒体路径: " + mediaPath); return mediaPath; } else { @@ -119,6 +120,7 @@ } else { String data = url.replace("\\", "/"); imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + data; +// imagePath = SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + data; } Log.d(TAG, "图片路径: " + imagePath); return imagePath; @@ -130,6 +132,7 @@ return url; } return SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409") + "/static/" + url; +// return SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401") + "/static/" + url; } public static String reformatURL(List urls) { diff --git a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java index 3485bc2..f5dc11e 100644 --- a/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java +++ b/app/src/main/java/com/casic/dcms/utils/retrofit/RetrofitServiceManager.java @@ -54,6 +54,7 @@ private static Retrofit createRetrofit() { String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://111.198.10.15:11409"); +// String ip = (String) SaveKeyValues.getValue(Constant.IP_KEY, "http://223.82.47.232:11401"); return new Retrofit.Builder() .baseUrl(ip) .addConverterFactory(GsonConverterFactory.create())//Gson转换器 diff --git a/app/src/main/res/drawable/ic_copy.xml b/app/src/main/res/drawable/ic_copy.xml new file mode 100644 index 0000000..7ffc6c1 --- /dev/null +++ b/app/src/main/res/drawable/ic_copy.xml @@ -0,0 +1,20 @@ + + + + + + diff --git a/app/src/main/res/layout/fragment_mine.xml b/app/src/main/res/layout/fragment_mine.xml index d7b5834..7f4dafc 100644 --- a/app/src/main/res/layout/fragment_mine.xml +++ b/app/src/main/res/layout/fragment_mine.xml @@ -123,6 +123,39 @@ layout="@layout/line" android:visibility="gone" /> + + + + + + + + + + + @@ -144,7 +177,7 @@ android:layout_marginEnd="@dimen/margin_10dp" android:layout_toStartOf="@id/updateVersionView" android:textColor="@color/black" - android:textSize="@dimen/titleFontSize" /> + android:textSize="@dimen/textFontSize" />