20230908

Bug

搜索出的视频不能播放

拉取过来的视频有远端的clip，显示黑屏也无法进行操作

在搜索结果页SearchResultActivity像首页一样过滤出本地的时候，同时在后台进行拉取远端视频

private suspend fun doSearchBySearchGroupList(
    keyArray: List<SearchGroup>,
    replaceAll: Boolean = true,
    beginCursor: String = ""
) {

    val log = logger.withTag(TAG, "Search", "searchByLabelKeyArray")
    log.i("keyArray = $keyArray, replaceAll = $replaceAll, beginCursor = $beginCursor")

    if (!replaceAll && beginCursor.isEmpty()) {
        logger.w(TAG, "ignore not replaceAll AND beginCursor empty to prevent repeat item")
        return
    }

    uiActionRequiredEvent.postValue(UiAction(UI_ACTION_BEGIN_REFRESH))
    sideLoadLabelKeys(keyArray) // 缓存搜索关键字
    log.d("begin refresh")

    val list = performOnIOWithDefault(emptyList()) {

        val resultClipsList = ArrayList<Clip>()
        var currentCursor = beginCursor

        do {
            log.d("getClipsListByLabel, c = $currentCursor, size = ${resultClipsList.size}")

            val allKeys = ArrayList<String>()
            keyArray.forEach {
                it.keys.forEach { k ->
                    allKeys.add(k)
                }
            }

            val resp = sdk.getClipsListByLabel(currentCursor, allKeys).await()

            resp.nextCursor.run {
                log.d("getClipsListByLabel, nextCursor = $this")
                currentCursor = this
                nextCursor = this
            }

            // 同框筛选
            val filteredResultClipList = resp.list?.filter { clip ->
                clip.containsSearchGroups(keyArray)
            }
            filteredResultClipList?.let { resultClipsList.addAll(it) }

        } while (resultClipsList.size < 30 /* 拍脑袋想的，填满屏幕 */ && currentCursor.isNotEmpty())

        resultClipsList
    }

  //------------------------------------------过滤-----------------------------------------------//
    // 过滤出本地视频
    val localList = list.filter { it.playMode == Clip.CLIP_PLAY_MODE_LOCAL }.toMutableList()

    if (replaceAll && localList.isEmpty()) {
        // fixme: 目前是因为replaceAll什么都刷不出来就返回，不是replaceAll的话列表已经有数据了，就不返回
        uiActionRequiredEvent.postValue(UiAction(UI_ACTION_BACK))
        log.i("no result, back")
    }

    if (replaceAll) {
        searchResultAdapter.replaceAll(list)
    } else {
        searchResultAdapter.addAll(localList)
    }

    withContext(Dispatchers.Main) {
        uiActionRequiredEvent.postValue(UiAction(UI_ACTION_END_REFRESH, replaceAll))
        log.d("end refresh")
    }
  //------------------------------------------过滤-----------------------------------------------//
}

同时拉取远端视频

/**
* 过滤远端视频资源，同时对远端视频发起拉取
*/
@SuppressLint("CheckResult")
private fun filterPlayList(list: List<Clip>): List<Clip> {
  val localList = list.filter { it.playMode == Clip.CLIP_PLAY_MODE_LOCAL }.toMutableList()
  val remoteList =
      list.filter { it.playMode == Clip.CLIP_PLAY_MODE_REMOTE_DEVICE }.toMutableList()

  logger.d(TAG, "localList size=${localList.size}, remoteList size=${remoteList.size}")

  // 远端拉取
  getRemoteList(remoteList)

  return localList
}

/**
* 远端拉取视频
*/
private fun getRemoteList(remoteList: List<Clip>) {
  if (remoteList.isEmpty()) {
      logger.d(TAG, "RemoteList is empty.")
      return
  }
  if (!NetworkUtil.isUsingNotMeteredNetwork(getApplication())) {
      logger.d(TAG, "Not currently connected to Wi-Fi.")
      return
  }
  // 远端拉取
  val avDataPacketList = ArrayList<Observable<AvDataPacket>>()
  remoteList.forEach {
      val data = it.originalDataList?.get(0)
      data?.apply {
          avDataPacketList.add(
              sdk.getDeviceOriginalData(
                  deviceID,
                  startTimeMillis,
                  endTimeMillis,
                  30
              )
          )
      }
  }
  logger.d(TAG, "AvDataStreamObservable List size=${avDataPacketList.size}")
  // 通过concat将所有的观察对象串成一条，依次订阅，失败则拉取下一个
  Observable.concat(avDataPacketList).onErrorComplete().doOnComplete {
      logger.i(TAG, "fetch remote data complete, but there may be some errors and omissions")
  }.doOnError {
      logger.e(TAG, "error = $it")
  }.subscribe()

}

New

收藏和转发给好友页面限制竖屏

9c36ed7672851dfda78b85ee549ff24ab9681b57

<activity
  android:name=".ui.user.FavoriteActivity"
  android:exported="false"
  android:screenOrientation="portrait" />

<activity
  android:name=".ui.share.ListShareToContactActivity"
  android:exported="false"
  android:screenOrientation="portrait" />