增加解绑设备

Author: neilyhe

sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/core/activity/EnhancedDeviceListActivity.kt

@@ -1,19 +1,19 @@
 package com.tencent.iot.explorer.link.demo.core.activity
 
 import android.content.Intent
-import android.os.Bundle
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
 import android.widget.ImageView
+import android.widget.PopupMenu
 import android.widget.TextView
 import android.widget.Toast
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
-import com.alibaba.fastjson.JSON
 import com.tencent.iot.explorer.link.core.auth.IoTAuth
 import com.tencent.iot.explorer.link.core.auth.callback.MyCallback
 import com.tencent.iot.explorer.link.core.auth.consts.RequestCode
+import com.tencent.iot.explorer.link.core.auth.entity.DeviceEntity
 import com.tencent.iot.explorer.link.core.auth.response.BaseResponse
 import com.tencent.iot.explorer.link.core.auth.response.DeviceListResponse
 import com.tencent.iot.explorer.link.core.auth.response.FamilyListResponse
@@ -23,15 +23,14 @@ import com.tencent.iot.explorer.link.demo.App
 import com.tencent.iot.explorer.link.demo.BaseActivity
 import com.tencent.iot.explorer.link.demo.R
 import com.tencent.iot.explorer.link.demo.common.log.L
-import com.tencent.iot.explorer.link.demo.core.entity.DeviceInfo
 import com.tencent.iot.explorer.link.demo.databinding.ActivityEnhancedDeviceListBinding
 
 /**
  * 增强版设备列表页面
  */
 class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBinding>(), MyCallback {
 
-    private val deviceList = mutableListOf<DeviceItem>()
+    private val deviceList = mutableListOf<DeviceEntity>()
     private lateinit var adapter: DeviceAdapter
 
     override fun getViewBinding(): ActivityEnhancedDeviceListBinding =
@@ -103,8 +102,8 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
         }
 
         // 设置菜单点击事件
-        adapter.setOnMenuClickListener { position, device ->
-            showDeviceMenu(position, device)
+        adapter.setOnMenuClickListener { position, device, rootView ->
+            showDeviceMenu(position, device, rootView)
         }
     }
 
@@ -122,7 +121,7 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
      */
     private fun showAddDevicePage() {
         Toast.makeText(this, "跳转到添加设备页面", Toast.LENGTH_SHORT).show()
-        startActivityForResult(Intent(this, AddDeviceActivity::class.java),0)
+        startActivityForResult(Intent(this, AddDeviceActivity::class.java), 0)
     }
 
     /**
@@ -137,18 +136,29 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
     /**
      * 打开设备详情
      */
-    private fun openDeviceDetail(device: DeviceItem) {
+    private fun openDeviceDetail(device: DeviceEntity) {
         // TODO: 跳转到设备详情页面
-        Toast.makeText(this, "打开设备: ${device.name}", Toast.LENGTH_SHORT).show()
+        Toast.makeText(this, "打开设备: ${device.DeviceName}", Toast.LENGTH_SHORT).show()
 //        jumpActivity(CameraDetailActivity::class.java)
     }
 
     /**
      * 显示设备菜单
      */
-    private fun showDeviceMenu(position: Int, device: DeviceItem) {
-        // TODO: 显示设备操作菜单（设置、分享、删除等）
-        Toast.makeText(this, "显示设备菜单: ${device.name}", Toast.LENGTH_SHORT).show()
+    private fun showDeviceMenu(position: Int, device: DeviceEntity, rootView: View) {
+        val popupMenu = PopupMenu(this, rootView)
+        popupMenu.menuInflater.inflate(R.menu.device_menu, popupMenu.menu)
+        popupMenu.setOnMenuItemClickListener { menuItem ->
+            when (menuItem.itemId) {
+                R.id.action_delete -> {
+                    IoTAuth.deviceImpl.deleteDevice(App.data.getCurrentFamily().FamilyId, device.ProductId,device.DeviceName,this@EnhancedDeviceListActivity)
+                    true
+                }
+
+                else -> false
+            }
+        }
+        popupMenu.show()
     }
 
     /**
@@ -242,21 +252,19 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
                         L.e("设备列表：${JsonManager.toJson(it.DeviceList)}")
                         if (it.DeviceList.isNotEmpty()) {
                             deviceList.clear()
-                            it.DeviceList.forEach {
-                                deviceList.add(
-                                    DeviceItem(
-                                        it.DeviceName,
-                                        "卧室",
-                                        true,
-                                        R.drawable.ic_camera_device
-                                    )
-                                )
-                            }
+                            deviceList.addAll(it.DeviceList)
                             refreshDeviceList()
                         }
                     }
                 }
             }
+
+            RequestCode.delete_device -> {
+                if (response.isSuccess()) {
+                    Toast.makeText(this, "设备删除成功", Toast.LENGTH_SHORT).show()
+                    initDeviceList()
+                }
+            }
         }
     }
 
@@ -273,11 +281,11 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
     /**
      * 设备列表适配器
      */
-    class DeviceAdapter(private val deviceList: List<DeviceItem>) :
+    class DeviceAdapter(private val deviceList: List<DeviceEntity>) :
         RecyclerView.Adapter<DeviceAdapter.DeviceViewHolder>() {
 
-        private var itemClickListener: ((Int, DeviceItem) -> Unit)? = null
-        private var menuClickListener: ((Int, DeviceItem) -> Unit)? = null
+        private var itemClickListener: ((Int, DeviceEntity) -> Unit)? = null
+        private var menuClickListener: ((Int, DeviceEntity, View) -> Unit)? = null
 
         class DeviceViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
             val ivDeviceIcon: ImageView = itemView.findViewById(R.id.iv_device_icon)
@@ -297,12 +305,12 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
         override fun onBindViewHolder(holder: DeviceViewHolder, position: Int) {
             val device = deviceList[position]
 
-            holder.tvDeviceName.text = device.name
-            holder.tvDeviceLocation.text = device.location
-            holder.ivDeviceIcon.setImageResource(device.iconRes)
+            holder.tvDeviceName.text = device.DeviceName
+            holder.tvDeviceLocation.text = device.RoomId
+//            holder.ivDeviceIcon.setImageResource(device.IconUrl)
 
             // 设置设备状态
-            if (device.isOnline) {
+            if (true) {
                 holder.tvDeviceStatus.text = "在线"
                 holder.indicatorStatus.setBackgroundResource(R.drawable.bg_status_online)
             } else {
@@ -317,17 +325,17 @@ class EnhancedDeviceListActivity : BaseActivity<ActivityEnhancedDeviceListBindin
 
             // 菜单按钮点击事件
             holder.btnDeviceMenu.setOnClickListener {
-                menuClickListener?.invoke(position, device)
+                menuClickListener?.invoke(position, device, holder.btnDeviceMenu)
             }
         }
 
         override fun getItemCount(): Int = deviceList.size
 
-        fun setOnItemClickListener(listener: (Int, DeviceItem) -> Unit) {
+        fun setOnItemClickListener(listener: (Int, DeviceEntity) -> Unit) {
             itemClickListener = listener
         }
 
-        fun setOnMenuClickListener(listener: (Int, DeviceItem) -> Unit) {
+        fun setOnMenuClickListener(listener: (Int, DeviceEntity, View) -> Unit) {
             menuClickListener = listener
         }
     }