diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 0579c02..3c38564 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -17,6 +17,7 @@
 
 
 class EventDetailActivity : BaseActivity() {
+
     override fun initLayoutView(): Int = R.layout.activity_event_detail
 
     override fun setupTopBarLayout() {
@@ -37,18 +38,17 @@
             dataView.text = "$data.0"
         }
         val images = intent.getStringExtra("images")
+
         /**
          * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg
          * images:
          * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg
          * */
         val urls: ArrayList<String> = ArrayList()
-        if (images == null) {
-            urls.add("")
-        } else {
-            if (images.isEmpty()) {
-                urls.add("")
-            } else {
+        // images == null
+        if (images != null) {
+            // images == ""
+            if (images.isNotEmpty()) {
                 val imageArray = images.split(",")
                 imageArray.forEach {
                     urls.add(it.combineImagePath())

diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 0579c02..3c38564 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -17,6 +17,7 @@
 
 
 class EventDetailActivity : BaseActivity() {
+
     override fun initLayoutView(): Int = R.layout.activity_event_detail
 
     override fun setupTopBarLayout() {
@@ -37,18 +38,17 @@
             dataView.text = "$data.0"
         }
         val images = intent.getStringExtra("images")
+
         /**
          * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg
          * images:
          * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg
          * */
         val urls: ArrayList<String> = ArrayList()
-        if (images == null) {
-            urls.add("")
-        } else {
-            if (images.isEmpty()) {
-                urls.add("")
-            } else {
+        // images == null
+        if (images != null) {
+            // images == ""
+            if (images.isNotEmpty()) {
                 val imageArray = images.split(",")
                 imageArray.forEach {
                     urls.add(it.combineImagePath())
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
index 5ecf86b..a09ab5e 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
@@ -666,14 +666,6 @@
                 alarmCount = 0
             }
         })
-        eventViewModel.loadState.observe(this@MapActivity, Observer {
-            when (it) {
-                is LoadState.Loading -> {
-                    OtherUtils.showLoadingDialog(this@MapActivity, "生成事件中，请稍后...")
-                }
-                else -> OtherUtils.dismissLoadingDialog()
-            }
-        })
     }
 
     /**

diff --git a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
index 0579c02..3c38564 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/EventDetailActivity.kt
@@ -17,6 +17,7 @@
 
 
 class EventDetailActivity : BaseActivity() {
+
     override fun initLayoutView(): Int = R.layout.activity_event_detail
 
     override fun setupTopBarLayout() {
@@ -37,18 +38,17 @@
             dataView.text = "$data.0"
         }
         val images = intent.getStringExtra("images")
+
         /**
          * images: 2020-12/6528aeb21cff426c91c43a7f8b716d1e.jpg
          * images:
          * images: 2020-12/c2fd5777fe5d4e09af0bbd6693f5fbf4.jpg,2020-12/7d91abc431d0482da33745bacc111bc4.jpg
          * */
         val urls: ArrayList<String> = ArrayList()
-        if (images == null) {
-            urls.add("")
-        } else {
-            if (images.isEmpty()) {
-                urls.add("")
-            } else {
+        // images == null
+        if (images != null) {
+            // images == ""
+            if (images.isNotEmpty()) {
                 val imageArray = images.split(",")
                 imageArray.forEach {
                     urls.add(it.combineImagePath())
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
index 5ecf86b..a09ab5e 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/MapActivity.kt
@@ -666,14 +666,6 @@
                 alarmCount = 0
             }
         })
-        eventViewModel.loadState.observe(this@MapActivity, Observer {
-            when (it) {
-                is LoadState.Loading -> {
-                    OtherUtils.showLoadingDialog(this@MapActivity, "生成事件中，请稍后...")
-                }
-                else -> OtherUtils.dismissLoadingDialog()
-            }
-        })
     }
 
     /**
diff --git a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventDetailActivity.kt b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventDetailActivity.kt
index 75230a2..15ddd44 100644
--- a/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventDetailActivity.kt
+++ b/app/src/main/java/com/casic/birmm/inspect/view/SingleModeEventDetailActivity.kt
@@ -42,12 +42,8 @@
          * images: /storage/emulated/0/Android/data/com.casic.birmm.inspect/files/Pictures/IMG_CMP_167066503.jpeg,/storage/emulated/0/Android/data/com.casic.birmm.inspect/files/Pictures/IMG_CMP_49917670.jpeg,/storage/emulated/0/Android/data/com.casic.birmm.inspect/files/Pictures/IMG_CMP_1069640.jpeg
          * */
         val urls: ArrayList<String> = ArrayList()
-        if (images == null) {
-            urls.add("")
-        } else {
-            if (images.isEmpty()) {
-                urls.add("")
-            } else {
+        if (images != null) {
+            if (images.isNotEmpty()) {
                 val imageArray = images.split(",")
                 imageArray.forEach {
                     urls.add(it)