Browse Source

Z991239-4219 #comment 删除json串中多余中括号

80274480 2 years ago
parent
commit
de8c6e35a6

+ 1 - 1
Module/mod_mediacontroller/mod_mediacontroller.cpp

@@ -1166,7 +1166,7 @@ ErrorCodeEnum CMediaControllerEntity::AutoGetVideoDeviceName(capture_config_t* c
 
 static CSimpleStringA generateCameraInfosJson(CSimpleStringA strEnv, CSimpleStringA strOpt, int iEnv, int iOpt, int iMtu)
 {
-	return CSimpleStringA::Format("[{\"EnvCamera\":\"%s\",\"OptCamera\":\"%s\",\"EnvRotate\":\"%d\",\"OptRotate\":\"%d\",\"mtu\":\"%d\"}]",
+	return CSimpleStringA::Format("{\"EnvCamera\":\"%s\",\"OptCamera\":\"%s\",\"EnvRotate\":\"%d\",\"OptRotate\":\"%d\",\"mtu\":\"%d\"}",
 		strEnv.GetData(), strOpt.GetData(), iEnv, iOpt, iMtu);
 }
 

+ 2 - 2
Module/mod_sipphone/mod_sipphone.cpp

@@ -1873,13 +1873,13 @@ void CSIPEntity::InitFreshTimeConfig()
 
 static CSimpleStringA generateAudioInfoJson(const char* handfreeIn, const char* handfreeOut, const char* pickupIn, const char* pickupOut)
 {
-	return CSimpleStringA::Format("[{\"handfree_in_dev\":\"%s\",\"handfree_out_dev\":\"%s\",\"pickup_in_dev\":\"%s\",\"pickup_out_dev\":\"%s\"}]",
+	return CSimpleStringA::Format("{\"handfree_in_dev\":\"%s\",\"handfree_out_dev\":\"%s\",\"pickup_in_dev\":\"%s\",\"pickup_out_dev\":\"%s\"}",
 		handfreeIn, handfreeOut, pickupIn, pickupOut);
 }
 
 static CSimpleStringA generateVolumeJson(int ihandfreeIn, int ihandfreeOut, int ipickupIn, int ipickupOut)
 {
-	return CSimpleStringA::Format("[{\"handfree_in_volume\":\"%d\",\"handfree_out_volume\":\"%d\",\"pickup_in_volume\":\"%d\",\"pickup_out_volume\":\"%d\"}]",
+	return CSimpleStringA::Format("{\"handfree_in_volume\":\"%d\",\"handfree_out_volume\":\"%d\",\"pickup_in_volume\":\"%d\",\"pickup_out_volume\":\"%d\"}",
 		ihandfreeIn, ihandfreeOut, ipickupIn, ipickupOut);
 }