Merge branch 'fix_webcam' into 'master_dev'

fix: 调整视频通道的更新

See merge request yunteng/thingskit!396

@@ -594,14 +594,14 @@ public class DefaultDeviceStateService extends AbstractPartitionBasedService<Dev
                     && stateData.getDeviceCreationTime() + state.getInactivityTimeout() <= ts) {
                     && stateData.getDeviceCreationTime() + state.getInactivityTimeout() <= ts) {
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                 if (partitionService.resolve(ServiceType.TB_CORE, stateData.getTenantId(), deviceId).isMyPartition()) {
                     reportInactivity(ts, deviceId, stateData);
                     reportInactivity(ts, deviceId, stateData);
-                    //thingskit update tkDevice state
-                    channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
                     if(stateData.getState().getLastActivityTime()>0){
                     if(stateData.getState().getLastActivityTime()>0){
                         String tenantId = stateData.getTenantId().getId().toString();
                         String tenantId = stateData.getTenantId().getId().toString();
                         String tbDeviceId = deviceId.getId().toString();
                         String tbDeviceId = deviceId.getId().toString();
                         tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
                         tkDeviceService.updateDeviceStateByTbDeviceId(tenantId,tbDeviceId,
                                 org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
                                 org.thingsboard.server.common.data.yunteng.enums.DeviceState.OFFLINE);
                         saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
                         saveDeviceStateLog(tenantId,tbDeviceId, FastIotConstants.StateValue.OFFLINE);
+                        //thingskit update tkDevice state
+                        channelService.updateVideoChannelState(deviceId.getId().toString(), StatusEnum.OFFLINE);
                     }
                     }
                 } else {
                 } else {
                     cleanupEntity(deviceId);
                     cleanupEntity(deviceId);

@@ -162,16 +162,17 @@ public class TkVideoControlServiceImpl implements TkVideoControlService {
                 "【流媒体SIP】收到【视频点播】结果=异常【{}】+数据【{}】",
                 "【流媒体SIP】收到【视频点播】结果=异常【{}】+数据【{}】",
                 fromDeviceRpcResponse.getError(),
                 fromDeviceRpcResponse.getError(),
                 fromDeviceRpcResponse.getResponse());
                 fromDeviceRpcResponse.getResponse());
-            fromDeviceRpcResponse
-                .getResponse()
-                .ifPresent(
-                    jsonStr -> {
-                      if (fromDeviceRpcResponse.getError().isEmpty()) {
-                        result.set(jsonStr);
-                      } else {
-                        result.set(fromDeviceRpcResponse.getError().get().name());
-                      }
-                    });
+            StatusEnum status = StatusEnum.ONLINE;
+            if(fromDeviceRpcResponse.getError().isPresent()){
+              String errorCodeName = fromDeviceRpcResponse.getError().get().name();
+              result.set(errorCodeName);
+              if("NO_ACTIVE_CONNECTION".equals(errorCodeName)){
+                status = StatusEnum.OFFLINE;
+              }
+            }else {
+              result.set(fromDeviceRpcResponse.getResponse().get());
+            }
+            tkVideoChannelService.updateVideoChannelState(deviceDTO.getTbDeviceId(),status);
             timeoutLatch.countDown();
             timeoutLatch.countDown();
           });
           });
     } catch (ThingsboardException  e) {
     } catch (ThingsboardException  e) {

@@ -101,6 +101,9 @@ public class TKSipUtils {
   }
   }
 
 
   public static VideoChanelDTO updateGps(VideoChanelDTO deviceChannel, String geoCoordSys) {
   public static VideoChanelDTO updateGps(VideoChanelDTO deviceChannel, String geoCoordSys) {
+    if (deviceChannel == null) {
+      return null;
+    }
     if (deviceChannel.getLongitude() * deviceChannel.getLatitude() > 0) {
     if (deviceChannel.getLongitude() * deviceChannel.getLatitude() > 0) {
 
 
       if (geoCoordSys == null) {
       if (geoCoordSys == null) {

@@ -338,7 +338,7 @@ public class TkMediaServerServiceImpl
 
 
   @Override
   @Override
   public HookResult zlmOnStreamChanged(OnStreamChangedHookParam param) {
   public HookResult zlmOnStreamChanged(OnStreamChangedHookParam param) {
-    log.error(
+    log.info(
         "WEBHOOK流(rtsp/rtmp)【on_stream_changed】{}应用【{}】的【{}/{}】协议，数据产生速度【{}】",
         "WEBHOOK流(rtsp/rtmp)【on_stream_changed】{}应用【{}】的【{}/{}】协议，数据产生速度【{}】",
         param.isRegist() ? "注册" : "注销",
         param.isRegist() ? "注册" : "注销",
         param.getApp(),
         param.getApp(),
@@ -539,7 +539,7 @@ public class TkMediaServerServiceImpl
 
 
   @Override
   @Override
   public JsonNode zlmOnStreamNoneReader(OnStreamNoneReaderHookParam param) {
   public JsonNode zlmOnStreamNoneReader(OnStreamNoneReaderHookParam param) {
-    log.error(
+    log.info(
         "WEBHOOK流【on_stream_none_reader】应用【{}】的【{}】协议，流ID【{}】",
         "WEBHOOK流【on_stream_none_reader】应用【{}】的【{}】协议，流ID【{}】",
         param.getApp(),
         param.getApp(),
         param.getSchema(),
         param.getSchema(),