Browse Source

Merge remote-tracking branch 'origin/master'

lihao1 3 years ago
parent
commit
3e7feeac32

+ 7 - 1
demo/src/main/java/com/sybotan/android/demo/activities/poc/DeviceActivity.kt

@@ -52,6 +52,12 @@ class DeviceActivity : BaseActivity() {
         spaceId = bundle?.getString("spaceId") ?: ""
         position = bundle?.getSerializable("position") as? Position
 
+        val positionOkIv = findViewById<ImageView>(R.id.positionOkIv)
+        positionOkIv.visibility = if (position != null) View.VISIBLE else View.INVISIBLE
+        val positionInfoTv = findViewById<TextView>(R.id.positionInfoTv)
+        positionInfoTv.text =
+            position?.let { "${it.z.region}(${it.x},${it.y},${it.z.offset})" } ?: ""
+
         val deviceCl = findViewById<ConstraintLayout>(R.id.deviceCl)
         deviceOkIv = findViewById(R.id.deviceOkIv)
         deviceInfoTv = findViewById(R.id.deviceInfoTv)
@@ -100,7 +106,7 @@ class DeviceActivity : BaseActivity() {
                 remark = remark,
                 position = pos
             )
-            
+
             mDeviceModel.addDevice(deivce)
         }