Skip to content

Commit 73400fc

Browse files
authored
Merge pull request #537 from HugoLipeng/qvs/VoiceChat
qvs fix createDevice Param bug
2 parents c940699 + bfa1975 commit 73400fc

File tree

2 files changed

+18
-3
lines changed

2 files changed

+18
-3
lines changed

src/main/java/com/qiniu/qvs/model/Device.java

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,16 @@
22

33
import com.google.gson.Gson;
44
import com.google.gson.GsonBuilder;
5+
import com.google.gson.reflect.TypeToken;
56
import com.qiniu.util.StringMap;
67
import lombok.AllArgsConstructor;
78
import lombok.Builder;
89
import lombok.Data;
910
import lombok.NoArgsConstructor;
1011

12+
import java.util.HashMap;
13+
import java.util.Map;
14+
1115
@Builder
1216
@Data
1317
@NoArgsConstructor
@@ -27,7 +31,18 @@ public class Device {
2731
* @return POST参数对象
2832
*/
2933
public StringMap transferPostParam() {
34+
Map<String, Object> paramMap = getStringObjectMap();
35+
StringMap result = new StringMap();
36+
result.putAll(paramMap);
37+
return result;
38+
}
39+
40+
private Map<String, Object> getStringObjectMap() {
3041
Gson gson = new GsonBuilder().enableComplexMapKeySerialization().create();
31-
return gson.fromJson(gson.toJson(this), StringMap.class);
42+
Map<String, Object> paramMap = gson.fromJson(gson.toJson(this), new TypeToken<HashMap<String, String>>() {
43+
}.getType());
44+
paramMap.put("type", type);
45+
paramMap.put("pullIfRegister", pullIfRegister);
46+
return paramMap;
3247
}
3348
}

src/test/java/test/com/qiniu/qvs/RecordTest.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public class RecordTest {
1818
private final String namespaceId = "3nm4x1e0xw855";
1919
private final String streamId = "31011500991320007536";
2020
private final String format = "m3u8";
21-
private final int start = 1639379380;
22-
private final int end = 1639379981;
21+
private final int start = 1640599830;
22+
private final int end = 1640600430;
2323

2424
@BeforeEach
2525
public void setUp() throws Exception {

0 commit comments

Comments
 (0)