Merge branch 'wvp-28181-2.0' into wvp-28181-2.0-multi-network

648540858

2022-11-08 96bb3814f65edb36327eb02f2ea1beed30f06dfc

 src/main/java/com/genersoft/iot/vmp/media/zlm/dto/StreamAuthorityInfo.java

@@ -1,5 +1,8 @@
package com.genersoft.iot.vmp.media.zlm.dto;

import com.genersoft.iot.vmp.media.zlm.dto.hook.OnPublishHookParam;
import com.genersoft.iot.vmp.media.zlm.dto.hook.OnStreamChangedHookParam;

/**
 * 流的鉴权信息
 * @author lin
@@ -102,13 +105,13 @@
        return streamAuthorityInfo;
    }

    public static StreamAuthorityInfo getInstanceByHook(MediaItem mediaItem) {
    public static StreamAuthorityInfo getInstanceByHook(OnStreamChangedHookParam onStreamChangedHookParam) {
        StreamAuthorityInfo streamAuthorityInfo = new StreamAuthorityInfo();
        streamAuthorityInfo.setApp(mediaItem.getApp());
        streamAuthorityInfo.setStream(mediaItem.getStream());
        streamAuthorityInfo.setId(mediaItem.getMediaServerId());
        streamAuthorityInfo.setOriginType(mediaItem.getOriginType());
        streamAuthorityInfo.setOriginTypeStr(mediaItem.getOriginTypeStr());
        streamAuthorityInfo.setApp(onStreamChangedHookParam.getApp());
        streamAuthorityInfo.setStream(onStreamChangedHookParam.getStream());
        streamAuthorityInfo.setId(onStreamChangedHookParam.getMediaServerId());
        streamAuthorityInfo.setOriginType(onStreamChangedHookParam.getOriginType());
        streamAuthorityInfo.setOriginTypeStr(onStreamChangedHookParam.getOriginTypeStr());
        return streamAuthorityInfo;
    }
}