解决冲突

app/src/main/java/com/mints/street/adapter/ItemEnterDestinationAdapter.kt

@@ -47,7 +47,7 @@ class ItemEnterDestinationAdapter(
         }
         list?.let { it ->
             holder.binding.tvName.text = it[position].area
-            holder.binding.tvNumberPeople.text = "人数"
+            holder.binding.tvNumberPeople.text = "${it[position].activeNum}W人去过"
             it[position].url?.let { url ->
                 for (index in 0..2) {
                     when (index) {

app/src/main/java/com/mints/street/bean/VrexperienceBean.kt

@@ -5,6 +5,7 @@ import java.io.Serializable
 class VreperienceBean: Serializable {
     val data: List<Data>?=null
     inner class Data(
+            val activeNum: Double,
             val area: String,
             val url: List<String>
     )

app/src/main/java/com/mints/street/main/MainActivity.kt

@@ -83,6 +83,12 @@ class MainActivity : BaseActivity<ActivityMainBinding, MainViewModel>() {
             })
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        viewModel.checkUpgrade()
+    }
+
 
     var oldTime: Long = 0
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {