使用iot-video平台接口拉取设备列表.

archurtan · archurtan · commit 2ac6cbe180ad · 2022-06-01T17:24:12.000+08:00
Change-Id: If1aafee7f25e71cf53970df96eca643ce72cb8c9
diff --git a/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/service/VideoBaseService.kt b/sdk/video-link-android/src/main/java/com/tencent/iot/video/link/service/VideoBaseService.kt
@@ -163,14 +163,13 @@ open class VideoBaseService(secretId: String, secretKey: String) {
      * video获取设备信息列表   DescribeDevices
      */
     fun describeDevices(
-        productId: String, returnModel: Boolean, limit: Int, offset: Int, callback: VideoCallback
+        productId: String, limit: Int, offset: Int, callback: VideoCallback
     ) {
         var headerParams = videoCommonHeaderParams("DescribeDevices")
         val param = TreeMap<String, Any>()
         param["Limit"] = limit
         param["Offset"] = offset
         param["ProductId"] = productId
-        param["ReturnModel"] = returnModel
         val authorization = sign(VideoHttpUtil.VIDEO_SERVICE, headerParams, param)
         if (authorization != null) {
             headerParams["Authorization"] = authorization
@@ -208,7 +207,7 @@ open class VideoBaseService(secretId: String, secretKey: String) {
 //        param["X-TC-Version"] = "2019-11-26"
 //        param["X-TC-Timestamp"] = (System.currentTimeMillis() / 1000).toString()
 //        return param
-        return videoCommonHeaderParams(action, "2019-11-26")
+        return videoCommonHeaderParams(action, "2021-11-25")
     }
 
     open fun sign(
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/DevInfo.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/DevInfo.kt
@@ -1,18 +1,16 @@
 package com.tencent.iot.explorer.link.demo.video
 
 class DevInfo {
-    var deviceName = ""
+    var DeviceName = ""
     var Status = 0
     var DevicePsk = ""
-    var CreateTime = 0L
-    var FirstOnlineTime = 0L
     var LoginTime = 0L
+    var ExpireTime = 0L
     var LogLevel = 0
-    var Version = ""
-    var channel = 0
-    var online = 0
-    var address = ""
-    var port = 0
+    var Online = 0
+    var EnableState =0
+    var Channel = 0
+
     set(value) {
         field = value
         Status = field
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/DevsAdapter.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/DevsAdapter.kt
@@ -62,7 +62,7 @@ class DevsAdapter(context: Context, list: MutableList<DevInfo>) : RecyclerView.A
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-        holder.devName.setText(list.get(position)?.deviceName)
+        holder.devName.setText(list.get(position)?.DeviceName)
 
         videoProductInfo?.let {
             when(it.DeviceType ) {
@@ -83,7 +83,7 @@ class DevsAdapter(context: Context, list: MutableList<DevInfo>) : RecyclerView.A
             tipText?.setText(context?.getString(R.string.devs_checked, checkedIds?.size))
         }
 
-        if (list.get(position)?.Status == 1) {
+        if (list.get(position)?.Online == 1) {
             holder.backgroundLayout.visibility = View.GONE
             holder.statusTv.setText(R.string.online)
             context?.let {
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoDeviceFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoDeviceFragment.kt
@@ -106,7 +106,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
             for (i in 0 until it.list.size) {
                 if (it.checkedIds.contains(i)) {
                     var dev = DevUrl2Preview()
-                    dev.devName = it.list.get(i).deviceName
+                    dev.devName = it.list.get(i).DeviceName
                     dev.Status = it.list.get(i).Status
                     allUrl.add(dev)
                 }
@@ -204,7 +204,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli
         videoProductInfo?.let {
             App.data.accessInfo?.let {
                 devs.clear()
-                VideoBaseService(it.accessId, it.accessToken).getDeviceList(it.productId, 0, 99, this)
+                VideoBaseService(it.accessId, it.accessToken).describeDevices(it.productId, 99, 0, this)
             }
         }
     }
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoWlanDetectActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/VideoWlanDetectActivity.kt
@@ -77,11 +77,9 @@ class VideoWlanDetectActivity : VideoBaseActivity() , CoroutineScope by MainScop
             App.data.accessInfo?.productId = product_id_layout.ev_content.text.toString()
 
             var dev = DevInfo()
-            dev.deviceName = datas.get(pos).deviceName
-            dev.channel = 0
+            dev.DeviceName = datas.get(pos).deviceName
+            dev.Channel = 0
             dev.Status = 1
-            dev.address = datas.get(pos).address
-            dev.port = datas.get(pos).port
             WlanVideoPreviewActivity.startPreviewActivity(this@VideoWlanDetectActivity, dev)
         }
     }
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/nvr/VideoNvrActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/nvr/VideoNvrActivity.kt
@@ -71,8 +71,8 @@ class VideoNvrActivity : VideoBaseActivity(), DevsAdapter.OnItemClicked, XP2PCal
 
             var devInfo = JSON.parseObject(devInfoStr, DevInfo::class.java)
             devInfo?.let {
-                tv_title.setText(it.deviceName)
-                showDev(it.deviceName)
+                tv_title.setText(it.DeviceName)
+                showDev(it.DeviceName)
             }
         }
     }
@@ -106,8 +106,8 @@ class VideoNvrActivity : VideoBaseActivity(), DevsAdapter.OnItemClicked, XP2PCal
                     var dev = DevUrl2Preview()
                     dev.devName = tv_title.text.toString()
                     dev.Status = it.list.get(i).Status
-                    dev.channel = it.list.get(i).channel
-                    dev.channel2DevName = it.list.get(i).deviceName
+                    dev.channel = it.list.get(i).Channel
+                    dev.channel2DevName = it.list.get(i).DeviceName
                     allUrl.add(dev)
                 }
             }
@@ -193,9 +193,9 @@ class VideoNvrActivity : VideoBaseActivity(), DevsAdapter.OnItemClicked, XP2PCal
 
     override fun onItemClicked(pos: Int, dev: DevInfo) {
         var devInfo = DevInfo()
-        devInfo.deviceName = tv_title.text.toString()
-        devInfo.online = dev.online
-        devInfo.channel = dev.channel
+        devInfo.DeviceName = tv_title.text.toString()
+        devInfo.Online = dev.Online
+        devInfo.Channel = dev.Channel
         var options = arrayListOf(getString(R.string.preview))
         var dlg =
             ListOptionsDialog(
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/cloudPlayback/VideoCloudPlaybackFragment.kt
@@ -100,7 +100,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa
             presenter.setAccessId(it.accessId)
             presenter.setAccessToken(it.accessToken)
             presenter.setProductId(it.productId)
-            presenter.setDeviceName(devInfo!!.deviceName)
+            presenter.setDeviceName(devInfo!!.DeviceName)
             try2GetRecord(Date())
         }
         palayback_video.surfaceTextureListener = this
@@ -118,7 +118,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa
     private fun try2GetVideoDateData() {
         App.data.accessInfo?.let { accessInfo ->
             devInfo?.let {
-                VideoBaseService(accessInfo.accessId, accessInfo.accessToken).getIPCDateData(accessInfo.productId, it.deviceName, this)
+                VideoBaseService(accessInfo.accessId, accessInfo.accessToken).getIPCDateData(accessInfo.productId, it.DeviceName, this)
             }
         }
     }
@@ -129,7 +129,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa
 
         App.data.accessInfo?.let {
             if (devInfo == null) return@let
-            VideoBaseService(it.accessId, it.accessToken).getIPCTimeData(it.productId, devInfo!!.deviceName, timeStr!!, this)
+            VideoBaseService(it.accessId, it.accessToken).getIPCTimeData(it.productId, devInfo!!.DeviceName, timeStr!!, this)
         }
     }
 
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/playback/localPlayback/VideoLocalPlaybackFragment.kt
@@ -162,12 +162,12 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
             devInfo ?: let { return@setOnClickListener }
             if (TextUtils.isEmpty(tv_all_time.text.toString())) return@setOnClickListener
 
-            var id = "${App.data.accessInfo?.productId}/${devInfo?.deviceName}"
+            var id = "${App.data.accessInfo?.productId}/${devInfo?.DeviceName}"
             Log.d(TAG, "setOnClickListener currentPlayerState $currentPlayerState")
 
             if (currentPlayerState) {
                 launch(Dispatchers.IO) {
-                    var stopCommand = Command.pauseLocalVideoUrl(devInfo!!.channel)
+                    var stopCommand = Command.pauseLocalVideoUrl(devInfo!!.Channel)
                     var resp = sendCmd(id, stopCommand)
                     var commandResp = JSONObject.parseObject(resp, CommandResp::class.java)
                     if (commandResp != null && commandResp.status == 0) {
@@ -183,7 +183,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 
             } else {
                 launch(Dispatchers.IO) {
-                    var startCommand = Command.resumeLocalVideoUrl(devInfo!!.channel)
+                    var startCommand = Command.resumeLocalVideoUrl(devInfo!!.Channel)
                     var resp = sendCmd(id, startCommand)
                     var commandResp = JSONObject.parseObject(resp, CommandResp::class.java)
                     if (commandResp != null && commandResp.status == 0) {
@@ -392,7 +392,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
                     val offset = initDownload(playbacks[pos])
                     if (offset >= 0) {
                         XP2P.startAvRecvService(
-                            "${App.data.accessInfo!!.productId}/${devInfo?.deviceName}",
+                            "${App.data.accessInfo!!.productId}/${devInfo?.DeviceName}",
                             "action=download&channel=0&file_name=${playbacks[pos].file_name}&offset=${offset}",
                             false
                         )
@@ -473,24 +473,24 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 
     private fun requestTagDateInfo(dateStr: String): String {
         if (App.data.accessInfo == null || devInfo == null ||
-            TextUtils.isEmpty(devInfo?.deviceName)
+            TextUtils.isEmpty(devInfo?.DeviceName)
         ) return ""
 
-        var id = "${App.data.accessInfo?.productId}/${devInfo?.deviceName}"
+        var id = "${App.data.accessInfo?.productId}/${devInfo?.DeviceName}"
         var timeStr = formateDateParam(dateStr)
         Log.d(TAG, "request timeStr $timeStr")
-        var command = Command.getMonthDates(devInfo!!.channel, timeStr)
+        var command = Command.getMonthDates(devInfo!!.Channel, timeStr)
         if (TextUtils.isEmpty(command)) return ""
         return sendCmd(id, command)
     }
 
     private fun refreshDateTime(date: Date) {
         if (App.data.accessInfo == null || devInfo == null ||
-            TextUtils.isEmpty(devInfo?.deviceName)
+            TextUtils.isEmpty(devInfo?.DeviceName)
         ) return
 
-        var id = "${App.data.accessInfo?.productId}/${devInfo?.deviceName}"
-        var command = Command.getDayTimeBlocks(devInfo!!.channel, date)
+        var id = "${App.data.accessInfo?.productId}/${devInfo?.DeviceName}"
+        var command = Command.getDayTimeBlocks(devInfo!!.Channel, date)
         var resp = sendCmd(id, command)
 
         if (TextUtils.isEmpty(resp)) return
@@ -517,7 +517,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
                 delay(1000)
                 if (!isShowing) currentPlayerState = false
                 Log.d(TAG, "playVideo currentPlayerState $currentPlayerState")
-                setPlayerUrl(Command.getLocalVideoUrl(it.channel, startTime, endTime), offset)
+                setPlayerUrl(Command.getLocalVideoUrl(it.Channel, startTime, endTime), offset)
                 tv_all_time.text = CommonUtils.formatTime(endTime * 1000 - startTime * 1000)
                 video_seekbar.max = (endTime - startTime).toInt()
             }
@@ -566,8 +566,8 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 
             if (offset > 0) {
                 devInfo?.let { dev ->
-                    var seekCommand = Command.seekLocalVideo(dev.channel, offset)
-                    var id = "${App.data.accessInfo?.productId}/${dev.deviceName}"
+                    var seekCommand = Command.seekLocalVideo(dev.Channel, offset)
+                    var id = "${App.data.accessInfo?.productId}/${dev.DeviceName}"
 
                     var seekResp = sendCmd(id, seekCommand)
                     var commandResp = JSON.parseObject(seekResp, CommandResp::class.java)
@@ -605,14 +605,14 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 
     private fun startConnect() {
         if (App.data.accessInfo == null || devInfo == null ||
-            TextUtils.isEmpty(devInfo?.deviceName)
+            TextUtils.isEmpty(devInfo?.DeviceName)
         ) return
 
         Thread(Runnable {
-            var id = "${App.data.accessInfo?.productId}/${devInfo?.deviceName}"
+            var id = "${App.data.accessInfo?.productId}/${devInfo?.DeviceName}"
             var started = XP2P.startServiceWithXp2pInfo(
                 id,
-                App.data.accessInfo?.productId, devInfo?.deviceName, ""
+                App.data.accessInfo?.productId, devInfo?.DeviceName, ""
             )
             if (started != 0) {
                 launch(Dispatchers.Main) {
@@ -627,7 +627,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 //                countDownLatchs.put("${App.data.accessInfo!!.productId}/${it.deviceName}", tmpCountDownLatch)
 //                tmpCountDownLatch.await()
                 urlPrefix =
-                    XP2P.delegateHttpFlv("${App.data.accessInfo!!.productId}/${it.deviceName}")
+                    XP2P.delegateHttpFlv("${App.data.accessInfo!!.productId}/${it.DeviceName}")
 
                 // 启动成功后，开始开启守护线程
 //                keepConnect(id)
@@ -657,7 +657,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
                 while (XP2P.startServiceWithXp2pInfo(
                         id,
                         App.data.accessInfo!!.productId,
-                        devInfo?.deviceName,
+                        devInfo?.DeviceName,
                         ""
                     ) != 0
                 ) {
@@ -827,7 +827,7 @@ class VideoLocalPlaybackFragment : VideoPlaybackBaseFragment(), TextureView.Surf
 
         App.data.accessInfo?.let { access ->
             devInfo?.let {
-                XP2P.stopService("${access.productId}/${it.deviceName}")
+                XP2P.stopService("${access.productId}/${it.DeviceName}")
             }
         }
         XP2P.setCallback(null)
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/VideoPreviewActivity.kt
@@ -309,7 +309,7 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface
         }
         radio_playback.setOnClickListener {
             var dev = DevInfo()
-            dev.deviceName = presenter.getDeviceName()
+            dev.DeviceName = presenter.getDeviceName()
             VideoPlaybackActivity.startPlaybackActivity(this@VideoPreviewActivity, dev)
         }
         radio_photo.setOnClickListener {
@@ -611,9 +611,9 @@ class VideoPreviewActivity : VideoBaseActivity(), EventView, TextureView.Surface
             var bundle = Bundle()
             intent.putExtra(VideoConst.VIDEO_CONFIG, bundle)
             var devInfo = DevUrl2Preview()
-            devInfo.devName = dev.deviceName
+            devInfo.devName = dev.DeviceName
             devInfo.Status = dev.Status
-            devInfo.channel = dev.channel
+            devInfo.channel = dev.Channel
             bundle.putString(VideoConst.VIDEO_CONFIG, JSON.toJSONString(devInfo))
             context.startActivity(intent)
         }
diff --git a/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/WlanVideoPreviewActivity.kt b/sdkdemo/src/main/java/com/tencent/iot/explorer/link/demo/video/preview/WlanVideoPreviewActivity.kt
@@ -372,11 +372,9 @@ class WlanVideoPreviewActivity : VideoBaseActivity(), TextureView.SurfaceTexture
             var bundle = Bundle()
             intent.putExtra(VideoConst.VIDEO_CONFIG, bundle)
             var devInfo = DevUrl2Preview()
-            devInfo.devName = dev.deviceName
+            devInfo.devName = dev.DeviceName
             devInfo.Status = dev.Status
-            devInfo.channel = dev.channel
-            devInfo.address = dev.address
-            devInfo.port = dev.port
+            devInfo.channel = dev.Channel
             bundle.putString(VideoConst.VIDEO_CONFIG, JSON.toJSONString(devInfo))
             context.startActivity(intent)
         }

Original file line number	Diff line number	Diff line change
`@@ -62,7 +62,7 @@ class DevsAdapter(context: Context, list: MutableList<DevInfo>) : RecyclerView.A`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`override fun onBindViewHolder(holder: ViewHolder, position: Int) {`
`65`		`- holder.devName.setText(list.get(position)?.deviceName)`
	`65`	`+ holder.devName.setText(list.get(position)?.DeviceName)`
`66`	`66`
`67`	`67`	`videoProductInfo?.let {`
`68`	`68`	`when(it.DeviceType ) {`
`@@ -83,7 +83,7 @@ class DevsAdapter(context: Context, list: MutableList<DevInfo>) : RecyclerView.A`
`83`	`83`	`tipText?.setText(context?.getString(R.string.devs_checked, checkedIds?.size))`
`84`	`84`	`}`
`85`	`85`
`86`		`- if (list.get(position)?.Status == 1) {`
	`86`	`+ if (list.get(position)?.Online == 1) {`
`87`	`87`	`holder.backgroundLayout.visibility = View.GONE`
`88`	`88`	`holder.statusTv.setText(R.string.online)`
`89`	`89`	`context?.let {`
Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli`
`106`	`106`	`for (i in 0 until it.list.size) {`
`107`	`107`	`if (it.checkedIds.contains(i)) {`
`108`	`108`	`var dev = DevUrl2Preview()`
`109`		`- dev.devName = it.list.get(i).deviceName`
	`109`	`+ dev.devName = it.list.get(i).DeviceName`
`110`	`110`	`dev.Status = it.list.get(i).Status`
`111`	`111`	`allUrl.add(dev)`
`112`	`112`	`}`
`@@ -204,7 +204,7 @@ class VideoDeviceFragment : BaseFragment(), VideoCallback, DevsAdapter.OnItemCli`
`204`	`204`	`videoProductInfo?.let {`
`205`	`205`	`App.data.accessInfo?.let {`
`206`	`206`	`devs.clear()`
`207`		`- VideoBaseService(it.accessId, it.accessToken).getDeviceList(it.productId, 0, 99, this)`
	`207`	`+ VideoBaseService(it.accessId, it.accessToken).describeDevices(it.productId, 99, 0, this)`
`208`	`208`	`}`
`209`	`209`	`}`
`210`	`210`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,11 +77,9 @@ class VideoWlanDetectActivity : VideoBaseActivity() , CoroutineScope by MainScop`
`77`	`77`	`App.data.accessInfo?.productId = product_id_layout.ev_content.text.toString()`
`78`	`78`
`79`	`79`	`var dev = DevInfo()`
`80`		`- dev.deviceName = datas.get(pos).deviceName`
`81`		`- dev.channel = 0`
	`80`	`+ dev.DeviceName = datas.get(pos).deviceName`
	`81`	`+ dev.Channel = 0`
`82`	`82`	`dev.Status = 1`
`83`		`- dev.address = datas.get(pos).address`
`84`		`- dev.port = datas.get(pos).port`
`85`	`83`	`WlanVideoPreviewActivity.startPreviewActivity(this@VideoWlanDetectActivity, dev)`
`86`	`84`	`}`
`87`	`85`	`}`
Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa`
`100`	`100`	`presenter.setAccessId(it.accessId)`
`101`	`101`	`presenter.setAccessToken(it.accessToken)`
`102`	`102`	`presenter.setProductId(it.productId)`
`103`		`- presenter.setDeviceName(devInfo!!.deviceName)`
	`103`	`+ presenter.setDeviceName(devInfo!!.DeviceName)`
`104`	`104`	`try2GetRecord(Date())`
`105`	`105`	`}`
`106`	`106`	`palayback_video.surfaceTextureListener = this`
`@@ -118,7 +118,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa`
`118`	`118`	`private fun try2GetVideoDateData() {`
`119`	`119`	`App.data.accessInfo?.let { accessInfo ->`
`120`	`120`	`devInfo?.let {`
`121`		`- VideoBaseService(accessInfo.accessId, accessInfo.accessToken).getIPCDateData(accessInfo.productId, it.deviceName, this)`
	`121`	`+ VideoBaseService(accessInfo.accessId, accessInfo.accessToken).getIPCDateData(accessInfo.productId, it.DeviceName, this)`
`122`	`122`	`}`
`123`	`123`	`}`
`124`	`124`	`}`
`@@ -129,7 +129,7 @@ class VideoCloudPlaybackFragment: VideoPlaybackBaseFragment(), TextureView.Surfa`
`129`	`129`
`130`	`130`	`App.data.accessInfo?.let {`
`131`	`131`	`if (devInfo == null) return@let`
`132`		`- VideoBaseService(it.accessId, it.accessToken).getIPCTimeData(it.productId, devInfo!!.deviceName, timeStr!!, this)`
	`132`	`+ VideoBaseService(it.accessId, it.accessToken).getIPCTimeData(it.productId, devInfo!!.DeviceName, timeStr!!, this)`
`133`	`133`	`}`
`134`	`134`	`}`
`135`	`135`