版本 1.0.5
1.修改跨域安全策略模块初始化时会阻塞主线程的问题,会影响QAV SDK相关命令的执行 2.支持罗博T7智写板输入
正在显示
11 个修改的文件
包含
453 行增加
和
199 行删除
| @@ -148,6 +148,9 @@ send 0 get_config ScrShare.width //获取屏幕共享宽度信息 | @@ -148,6 +148,9 @@ send 0 get_config ScrShare.width //获取屏幕共享宽度信息 | ||
| 148 | send 0 set_config ConfigInfo.use_smart_streaming_sdk=1 //设置使用SmartSDK | 148 | send 0 set_config ConfigInfo.use_smart_streaming_sdk=1 //设置使用SmartSDK |
| 149 | send 0 get_config ScrShare.width=1920 //设置屏幕共享宽度为1920 | 149 | send 0 get_config ScrShare.width=1920 //设置屏幕共享宽度为1920 |
| 150 | 150 | ||
| 151 | +(16)robotpen输入 | ||
| 152 | +参考liveassistant_web_demo: ggit@123.56.226.173:hubin/liveAssistant_web_demo.git | ||
| 153 | + | ||
| 151 | 154 | ||
| 152 | 2. 协议 | 155 | 2. 协议 |
| 153 | 详见libws\ws_data.h | 156 | 详见libws\ws_data.h |
| @@ -159,6 +162,386 @@ typedef struct tagWSData_S | @@ -159,6 +162,386 @@ typedef struct tagWSData_S | ||
| 159 | uint32_ws data_len; | 162 | uint32_ws data_len; |
| 160 | uint8_ws *data; | 163 | uint8_ws *data; |
| 161 | }WSData_S; | 164 | }WSData_S; |
| 165 | + | ||
| 166 | +即:客户端和服务器端发送的数据都有如下8字节数据头 | ||
| 167 | ++---------+------------+---------+-----------+-----------------+ | ||
| 168 | +| 2byte | 1byte | 1byte | 4byte | data_len byte | | ||
| 169 | ++---------+------------+---------+-----------+-----------------+ | ||
| 170 | +| cmd | byte_order | resv | data_len | data | | ||
| 171 | ++---------+------------+---------+-----------+-----------------+ | ||
| 172 | +cmd: 命令类型 | ||
| 173 | +byte_order:数据大小端, 0: little endian, 1: bit endian | ||
| 174 | +resv:保留字节 | ||
| 175 | +data_len: 数据头后面的数据长度 | ||
| 176 | + | ||
| 177 | +命令类型定义: | ||
| 178 | +客户端发送给liveserv的命令 | ||
| 179 | ++----------------------------+----+ | ||
| 180 | +| 命令 | 值 | | ||
| 181 | ++----------------------------+----+ | ||
| 182 | +| WS_CMD_UNKNOWN | 0 | | ||
| 183 | ++----------------------------+----+ | ||
| 184 | +| WS_CMD_MOV_START | 1 | | ||
| 185 | ++----------------------------+----+ | ||
| 186 | +| WS_CMD_MOV_STOP | 2 | | ||
| 187 | ++----------------------------+----+ | ||
| 188 | +| WS_CMD_MOV_PAUSE | 3 | | ||
| 189 | ++----------------------------+----+ | ||
| 190 | +| WS_CMD_MOV_RESUME | 4 | | ||
| 191 | ++----------------------------+----+ | ||
| 192 | +| WS_CMD_MOV_SEEK | 5 | | ||
| 193 | ++----------------------------+----+ | ||
| 194 | +| WS_CMD_SS_START | 6 | | ||
| 195 | ++----------------------------+----+ | ||
| 196 | +| WS_CMD_SS_STOP | 7 | | ||
| 197 | ++----------------------------+----+ | ||
| 198 | +| WS_CMD_REC_START | 8 | | ||
| 199 | ++----------------------------+----+ | ||
| 200 | +| WS_CMD_REC_STOP | 9 | | ||
| 201 | ++----------------------------+----+ | ||
| 202 | +| WS_CMD_REC_PAUSE | 10 | | ||
| 203 | ++----------------------------+----+ | ||
| 204 | +| WS_CMD_REC_RESUME | 11 | | ||
| 205 | ++----------------------------+----+ | ||
| 206 | +| WS_CMD_REC_PUSH_AUDIO_DATA | 12 | | ||
| 207 | ++----------------------------+----+ | ||
| 208 | +| WS_CMD_MOV_VERSION | 13 | | ||
| 209 | ++----------------------------+----+ | ||
| 210 | +| WS_CMD_SS_VERSION | 14 | | ||
| 211 | ++----------------------------+----+ | ||
| 212 | +| WS_CMD_REC_VERSION | 15 | | ||
| 213 | ++----------------------------+----+ | ||
| 214 | +| WS_CMD_QAV_LOGIN | 16 | | ||
| 215 | ++----------------------------+----+ | ||
| 216 | +| WS_CMD_QAV_LOGOUT | 17 | | ||
| 217 | ++----------------------------+----+ | ||
| 218 | +| WS_CMD_QAV_ENTER_ROOM | 18 | | ||
| 219 | ++----------------------------+----+ | ||
| 220 | +| WS_CMD_QAV_LEAVE_ROOM | 19 | | ||
| 221 | ++----------------------------+----+ | ||
| 222 | +| WS_CMD_QAV_OPEN_MIC | 20 | | ||
| 223 | ++----------------------------+----+ | ||
| 224 | +| WS_CMD_QAV_CLOSE_MIC | 21 | | ||
| 225 | ++----------------------------+----+ | ||
| 226 | +| WS_CMD_QAV_OPEN_PLAYER | 22 | | ||
| 227 | ++----------------------------+----+ | ||
| 228 | +| WS_CMD_QAV_CLOSE_PLAYER | 23 | | ||
| 229 | ++----------------------------+----+ | ||
| 230 | +| WS_CMD_QAV_MUTE_AUDIO | 24 | | ||
| 231 | ++----------------------------+----+ | ||
| 232 | +| WS_CMD_QAV_UNMUTE_AUDIO | 25 | | ||
| 233 | ++----------------------------+----+ | ||
| 234 | +| WS_CMD_GET_MIC | 26 | | ||
| 235 | ++----------------------------+----+ | ||
| 236 | +| WS_CMD_DS_START | 27 | | ||
| 237 | ++----------------------------+----+ | ||
| 238 | +| WS_CMD_DS_STOP | 28 | | ||
| 239 | ++----------------------------+----+ | ||
| 240 | +| WS_CMD_AUD_START | 29 | | ||
| 241 | ++----------------------------+----+ | ||
| 242 | +| WS_CMD_AUD_STOP | 30 | | ||
| 243 | ++----------------------------+----+ | ||
| 244 | +| WS_CMD_CONN_CLOSE | 31 | | ||
| 245 | ++----------------------------+----+ | ||
| 246 | +| WS_CMD_PEN_START | 32 | | ||
| 247 | ++----------------------------+----+ | ||
| 248 | +| WS_CMD_PEN_STOP | 33 | | ||
| 249 | ++----------------------------+----+ | ||
| 250 | +| WS_CMD_PEN_VERSION | 34 | | ||
| 251 | ++----------------------------+----+ | ||
| 252 | +| WS_CMD_QAV_DEVICE | 35 | | ||
| 253 | ++----------------------------+----+ | ||
| 254 | +| WS_CMD_CBD_QUERY | 36 | | ||
| 255 | ++----------------------------+----+ | ||
| 256 | +| WS_CMD_CBD_GET | 37 | | ||
| 257 | ++----------------------------+----+ | ||
| 258 | +| WS_CMD_FILE_GET | 38 | | ||
| 259 | ++----------------------------+----+ | ||
| 260 | +| WS_CMD_FILE_SET | 39 | | ||
| 261 | ++----------------------------+----+ | ||
| 262 | +| WS_CMD_RESTART | 40 | | ||
| 263 | ++----------------------------+----+ | ||
| 264 | +| WS_CMD_GET_CAM | 41 | | ||
| 265 | ++----------------------------+----+ | ||
| 266 | +| WS_CMD_CAM_START | 42 | | ||
| 267 | ++----------------------------+----+ | ||
| 268 | +| WS_CMD_CAM_STOP | 43 | | ||
| 269 | ++----------------------------+----+ | ||
| 270 | +| WS_CMD_SWITCH_SCENE | 44 | | ||
| 271 | ++----------------------------+----+ | ||
| 272 | +| WS_CMD_SHOW_UI | 45 | | ||
| 273 | ++----------------------------+----+ | ||
| 274 | +| WS_CMD_SET_VIDEO_PARAM | 46 | | ||
| 275 | ++----------------------------+----+ | ||
| 276 | +| WS_CMD_GET_VIDEO_PARAM | 47 | | ||
| 277 | ++----------------------------+----+ | ||
| 278 | +| WS_CMD_START_RECORD | 48 | | ||
| 279 | ++----------------------------+----+ | ||
| 280 | +| WS_CMD_STOP_RECORD | 49 | | ||
| 281 | ++----------------------------+----+ | ||
| 282 | +| WS_CMD_START_PUSH | 50 | | ||
| 283 | ++----------------------------+----+ | ||
| 284 | +| WS_CMD_STOP_PUSH | 51 | | ||
| 285 | ++----------------------------+----+ | ||
| 286 | +| WS_CMD_GET_RTMP_PORT | 52 | | ||
| 287 | ++----------------------------+----+ | ||
| 288 | +| WS_CMD_SET_MIC_VOL | 53 | | ||
| 289 | ++----------------------------+----+ | ||
| 290 | +| WS_CMD_GET_MIC_VOL | 54 | | ||
| 291 | ++----------------------------+----+ | ||
| 292 | +| WS_CMD_SET_CONFIG | 55 | | ||
| 293 | ++----------------------------+----+ | ||
| 294 | +| WS_CMD_GET_CONFIG | 56 | | ||
| 295 | ++----------------------------+----+ | ||
| 296 | +| WS_CMD_EXT_INPUT | 57 | | ||
| 297 | ++----------------------------+----+ | ||
| 298 | + | ||
| 299 | +liveserv返回客户端的结果,状态 | ||
| 300 | ++-------------------------------+-----+ | ||
| 301 | +| 命令 | 值 | | ||
| 302 | ++-------------------------------+-----+ | ||
| 303 | +| WS_RES_MOV_START_SUC | 0 | | ||
| 304 | ++-------------------------------+-----+ | ||
| 305 | +| WS_RES_MOV_START_FAIL | 1 | | ||
| 306 | ++-------------------------------+-----+ | ||
| 307 | +| WS_RES_MOV_STOP_SUC | 2 | | ||
| 308 | ++-------------------------------+-----+ | ||
| 309 | +| WS_RES_MOV_STOP_FAIL | 3 | | ||
| 310 | ++-------------------------------+-----+ | ||
| 311 | +| WS_RES_MOV_PAUSE_SUC | 4 | | ||
| 312 | ++-------------------------------+-----+ | ||
| 313 | +| WS_RES_MOV_PAUSE_FAIL | 5 | | ||
| 314 | ++-------------------------------+-----+ | ||
| 315 | +| WS_RES_MOV_RESUME_SUC | 6 | | ||
| 316 | ++-------------------------------+-----+ | ||
| 317 | +| WS_RES_MOV_RESUME_FAIL | 7 | | ||
| 318 | ++-------------------------------+-----+ | ||
| 319 | +| WS_RES_MOV_SEEK_SUC | 8 | | ||
| 320 | ++-------------------------------+-----+ | ||
| 321 | +| WS_RES_MOV_SEEK_FAIL | 9 | | ||
| 322 | ++-------------------------------+-----+ | ||
| 323 | +| WS_RES_MOV_PROPERTY | 10 | | ||
| 324 | ++-------------------------------+-----+ | ||
| 325 | +| WS_RES_SS_START_SUC | 11 | | ||
| 326 | ++-------------------------------+-----+ | ||
| 327 | +| WS_RES_SS_START_FAIL | 12 | | ||
| 328 | ++-------------------------------+-----+ | ||
| 329 | +| WS_RES_SS_STOP_SUC | 13 | | ||
| 330 | ++-------------------------------+-----+ | ||
| 331 | +| WS_RES_SS_STOP_FAIL | 14 | | ||
| 332 | ++-------------------------------+-----+ | ||
| 333 | +| WS_RES_REC_START_SUC | 15 | | ||
| 334 | ++-------------------------------+-----+ | ||
| 335 | +| WS_RES_REC_START_FAIL | 16 | | ||
| 336 | ++-------------------------------+-----+ | ||
| 337 | +| WS_RES_REC_STOP_SUC | 17 | | ||
| 338 | ++-------------------------------+-----+ | ||
| 339 | +| WS_RES_REC_STOP_FAIL | 18 | | ||
| 340 | ++-------------------------------+-----+ | ||
| 341 | +| WS_RES_REC_PAUSE_SUC | 19 | | ||
| 342 | ++-------------------------------+-----+ | ||
| 343 | +| WS_RES_REC_PAUSE_FAIL | 20 | | ||
| 344 | ++-------------------------------+-----+ | ||
| 345 | +| WS_RES_REC_RESUME_SUC | 21 | | ||
| 346 | ++-------------------------------+-----+ | ||
| 347 | +| WS_RES_REC_RESUME_FAIL | 22 | | ||
| 348 | ++-------------------------------+-----+ | ||
| 349 | +| WS_RES_MOV_PLAY_FINISH | 23 | | ||
| 350 | ++-------------------------------+-----+ | ||
| 351 | +| WS_RES_MOV_VERSION | 24 | | ||
| 352 | ++-------------------------------+-----+ | ||
| 353 | +| WS_RES_SS_VERSION | 25 | | ||
| 354 | ++-------------------------------+-----+ | ||
| 355 | +| WS_RES_REC_VERSION | 26 | | ||
| 356 | ++-------------------------------+-----+ | ||
| 357 | +| WS_RES_MOV_SELECT_FILE_CANCEL | 27 | | ||
| 358 | ++-------------------------------+-----+ | ||
| 359 | +| WS_RES_QAV_LOGIN_SUC | 28 | | ||
| 360 | ++-------------------------------+-----+ | ||
| 361 | +| WS_RES_QAV_LOGIN_FAIL | 29 | | ||
| 362 | ++-------------------------------+-----+ | ||
| 363 | +| WS_RES_QAV_LOGOUT_SUC | 30 | | ||
| 364 | ++-------------------------------+-----+ | ||
| 365 | +| WS_RES_QAV_LOGOUT_FAIL | 31 | | ||
| 366 | ++-------------------------------+-----+ | ||
| 367 | +| WS_RES_QAV_ENTERROOM_SUC | 32 | | ||
| 368 | ++-------------------------------+-----+ | ||
| 369 | +| WS_RES_QAV_ENTERROOM_FAIL | 33 | | ||
| 370 | ++-------------------------------+-----+ | ||
| 371 | +| WS_RES_QAV_LEAVEROOM_SUC | 34 | | ||
| 372 | ++-------------------------------+-----+ | ||
| 373 | +| WS_RES_QAV_LEAVEROOM_FAIL | 35 | | ||
| 374 | ++-------------------------------+-----+ | ||
| 375 | +| WS_RES_QAV_OPEN_MIC_SUC | 36 | | ||
| 376 | ++-------------------------------+-----+ | ||
| 377 | +| WS_RES_QAV_OPEN_MIC_FAIL | 37 | | ||
| 378 | ++-------------------------------+-----+ | ||
| 379 | +| WS_RES_QAV_OPEN_MIC_NODEV | 38 | | ||
| 380 | ++-------------------------------+-----+ | ||
| 381 | +| WS_RES_QAV_CLOSE_MIC_SUC | 39 | | ||
| 382 | ++-------------------------------+-----+ | ||
| 383 | +| WS_RES_QAV_CLOSE_MIC_FAIL | 40 | | ||
| 384 | ++-------------------------------+-----+ | ||
| 385 | +| WS_RES_QAV_CLOSE_MIC_NODEV | 41 | | ||
| 386 | ++-------------------------------+-----+ | ||
| 387 | +| WS_RES_QAV_OPEN_PLAYER_SUC | 42 | | ||
| 388 | ++-------------------------------+-----+ | ||
| 389 | +| WS_RES_QAV_OPEN_PLAYER_FAIL | 43 | | ||
| 390 | ++-------------------------------+-----+ | ||
| 391 | +| WS_RES_QAV_OPEN_PLAYER_NODEV | 44 | | ||
| 392 | ++-------------------------------+-----+ | ||
| 393 | +| WS_RES_QAV_CLOSE_PLAYER_SUC | 45 | | ||
| 394 | ++-------------------------------+-----+ | ||
| 395 | +| WS_RES_QAV_CLOSE_PLAYER_FAIL | 46 | | ||
| 396 | ++-------------------------------+-----+ | ||
| 397 | +| WS_RES_QAV_CLOSE_PLAYER_NODEV | 47 | | ||
| 398 | ++-------------------------------+-----+ | ||
| 399 | +| WS_RES_QAV_MUTE_AUDIO_SUC | 48 | | ||
| 400 | ++-------------------------------+-----+ | ||
| 401 | +| WS_RES_QAV_MUTE_AUDIO_FAIL | 49 | | ||
| 402 | ++-------------------------------+-----+ | ||
| 403 | +| WS_RES_QAV_UNMUTE_AUDIO_SUC | 50 | | ||
| 404 | ++-------------------------------+-----+ | ||
| 405 | +| WS_RES_QAV_UNMUTE_AUDIO_FAIL | 51 | | ||
| 406 | ++-------------------------------+-----+ | ||
| 407 | +| WS_RES_REC_SAVE_FILE_CANCEL | 52 | | ||
| 408 | ++-------------------------------+-----+ | ||
| 409 | +| WS_RES_GET_MIC_SUC | 53 | | ||
| 410 | ++-------------------------------+-----+ | ||
| 411 | +| WS_RES_GET_MIC_FAIL | 54 | | ||
| 412 | ++-------------------------------+-----+ | ||
| 413 | +| WS_RES_DS_START_SUC | 55 | | ||
| 414 | ++-------------------------------+-----+ | ||
| 415 | +| WS_RES_DS_START_FAIL | 56 | | ||
| 416 | ++-------------------------------+-----+ | ||
| 417 | +| WS_RES_DS_STOP_SUC | 57 | | ||
| 418 | ++-------------------------------+-----+ | ||
| 419 | +| WS_RES_DS_STOP_FAIL | 58 | | ||
| 420 | ++-------------------------------+-----+ | ||
| 421 | +| WS_RES_AUD_START_SUC | 59 | | ||
| 422 | ++-------------------------------+-----+ | ||
| 423 | +| WS_RES_AUD_START_FAIL | 60 | | ||
| 424 | ++-------------------------------+-----+ | ||
| 425 | +| WS_RES_AUD_STOP_SUC | 61 | | ||
| 426 | ++-------------------------------+-----+ | ||
| 427 | +| WS_RES_AUD_STOP_FAIL | 62 | | ||
| 428 | ++-------------------------------+-----+ | ||
| 429 | +| WS_RES_AUD_DATA | 63 | | ||
| 430 | ++-------------------------------+-----+ | ||
| 431 | +| WS_RES_SS_DATA | 64 | | ||
| 432 | ++-------------------------------+-----+ | ||
| 433 | +| WS_RES_MOV_DATA | 65 | | ||
| 434 | ++-------------------------------+-----+ | ||
| 435 | +| WS_RES_PEN_START_SUC | 66 | | ||
| 436 | ++-------------------------------+-----+ | ||
| 437 | +| WS_RES_PEN_START_FAIL | 67 | | ||
| 438 | ++-------------------------------+-----+ | ||
| 439 | +| WS_RES_PEN_STOP_SUC | 68 | | ||
| 440 | ++-------------------------------+-----+ | ||
| 441 | +| WS_RES_PEN_STOP_FAIL | 69 | | ||
| 442 | ++-------------------------------+-----+ | ||
| 443 | +| WS_RES_PEN_VERSION | 70 | | ||
| 444 | ++-------------------------------+-----+ | ||
| 445 | +| "WS_RES_QAV_DEVICE_SUC | 71 | | ||
| 446 | ++-------------------------------+-----+ | ||
| 447 | +| WS_RES_QAV_DEVICE_FAIL | 72 | | ||
| 448 | ++-------------------------------+-----+ | ||
| 449 | +| WS_RES_CBD_QUERY_SUC | 73 | | ||
| 450 | ++-------------------------------+-----+ | ||
| 451 | +| WS_RES_CBD_QUERY_FAIL | 74 | | ||
| 452 | ++-------------------------------+-----+ | ||
| 453 | +| WS_RES_CBD_GET_SUC | 75 | | ||
| 454 | ++-------------------------------+-----+ | ||
| 455 | +| WS_RES_CBD_GET_FAIL | 76 | | ||
| 456 | ++-------------------------------+-----+ | ||
| 457 | +| WS_RES_FILE_GET_SUC | 77 | | ||
| 458 | ++-------------------------------+-----+ | ||
| 459 | +| WS_RES_FILE_GET_FAIL | 78 | | ||
| 460 | ++-------------------------------+-----+ | ||
| 461 | +| WS_RES_FILE_SET_SUC | 79 | | ||
| 462 | ++-------------------------------+-----+ | ||
| 463 | +| WS_RES_FILE_SET_FAIL | 80 | | ||
| 464 | ++-------------------------------+-----+ | ||
| 465 | +| WS_RES_RESTART_SUC | 81 | | ||
| 466 | ++-------------------------------+-----+ | ||
| 467 | +| WS_RES_RESTART_FAIL | 82 | | ||
| 468 | ++-------------------------------+-----+ | ||
| 469 | +| WS_RES_GET_CAM_SUC | 83 | | ||
| 470 | ++-------------------------------+-----+ | ||
| 471 | +| WS_RES_GET_CAM_FAIL | 84 | | ||
| 472 | ++-------------------------------+-----+ | ||
| 473 | +| WS_RES_CAM_START_SUC | 85 | | ||
| 474 | ++-------------------------------+-----+ | ||
| 475 | +| WS_RES_CAM_START_FAIL | 86 | | ||
| 476 | ++-------------------------------+-----+ | ||
| 477 | +| WS_RES_CAM_STOP_SUC | 87 | | ||
| 478 | ++-------------------------------+-----+ | ||
| 479 | +| WS_RES_CAM_STOP_FAIL | 88 | | ||
| 480 | ++-------------------------------+-----+ | ||
| 481 | +| WS_RES_SWITCH_SCENE_SUC | 89 | | ||
| 482 | ++-------------------------------+-----+ | ||
| 483 | +| WS_RES_SWITCH_SCENE_FAIL | 90 | | ||
| 484 | ++-------------------------------+-----+ | ||
| 485 | +| WS_RES_PUSH_STREAM_FAIL | 91 | | ||
| 486 | ++-------------------------------+-----+ | ||
| 487 | +| WS_RES_SHOW_UI_SUC | 92 | | ||
| 488 | ++-------------------------------+-----+ | ||
| 489 | +| WS_RES_SET_VIDEO_PARAM_SUC | 93 | | ||
| 490 | ++-------------------------------+-----+ | ||
| 491 | +| WS_RES_SET_VIDEO_PARAM_FAIL | 94 | | ||
| 492 | ++-------------------------------+-----+ | ||
| 493 | +| WS_RES_GET_VIDEO_PARAM_SUC | 95 | | ||
| 494 | ++-------------------------------+-----+ | ||
| 495 | +| WS_RES_GET_VIDEO_PARAM_FAIL | 96 | | ||
| 496 | ++-------------------------------+-----+ | ||
| 497 | +| WS_RES_START_RECORD_SUC | 97 | | ||
| 498 | ++-------------------------------+-----+ | ||
| 499 | +| WS_RES_START_RECORD_FAIL | 98 | | ||
| 500 | ++-------------------------------+-----+ | ||
| 501 | +| WS_RES_STOP_RECORD_SUC | 99 | | ||
| 502 | ++-------------------------------+-----+ | ||
| 503 | +| WS_RES_STOP_RECORD_FAIL | 100 | | ||
| 504 | ++-------------------------------+-----+ | ||
| 505 | +| WS_RES_START_PUSH_SUC | 101 | | ||
| 506 | ++-------------------------------+-----+ | ||
| 507 | +| WS_RES_START_PUSH_FAIL | 102 | | ||
| 508 | ++-------------------------------+-----+ | ||
| 509 | +| WS_RES_STOP_PUSH_SUC | 103 | | ||
| 510 | ++-------------------------------+-----+ | ||
| 511 | +| WS_RES_STOP_PUSH_FAIL | 104 | | ||
| 512 | ++-------------------------------+-----+ | ||
| 513 | +| WS_RES_GET_RTMP_PORT_SUC | 105 | | ||
| 514 | ++-------------------------------+-----+ | ||
| 515 | +| WS_RES_GET_RTMP_PORT_FAIL | 106 | | ||
| 516 | ++-------------------------------+-----+ | ||
| 517 | +| WS_RES_SET_MIC_VOL_SUC | 107 | | ||
| 518 | ++-------------------------------+-----+ | ||
| 519 | +| WS_RES_SET_MIC_VOL_FAIL | 108 | | ||
| 520 | ++-------------------------------+-----+ | ||
| 521 | +| WS_RES_GET_MIC_VOL_SUC | 109 | | ||
| 522 | ++-------------------------------+-----+ | ||
| 523 | +| WS_RES_GET_MIC_VOL_FAIL | 110 | | ||
| 524 | ++-------------------------------+-----+ | ||
| 525 | +| WS_RES_RTMP_CONNECTING | 111 | | ||
| 526 | ++-------------------------------+-----+ | ||
| 527 | +| WS_RES_RTMP_CONNECT_SUC | 112 | | ||
| 528 | ++-------------------------------+-----+ | ||
| 529 | +| WS_RES_RTMP_CONNECT_FAIL | 113 | | ||
| 530 | ++-------------------------------+-----+ | ||
| 531 | +| WS_RES_RTMP_CONNECT_CLOSED | 114 | | ||
| 532 | ++-------------------------------+-----+ | ||
| 533 | +| WS_RES_SET_CONFIG_SUC | 115 | | ||
| 534 | ++-------------------------------+-----+ | ||
| 535 | +| WS_RES_SET_CONFIG_FAIL | 116 | | ||
| 536 | ++-------------------------------+-----+ | ||
| 537 | +| WS_RES_GET_CONFIG_SUC | 117 | | ||
| 538 | ++-------------------------------+-----+ | ||
| 539 | +| WS_RES_GET_CONFIG_FAIL | 118 | | ||
| 540 | ++-------------------------------+-----+ | ||
| 541 | +| WS_RES_EXT_INPUT | 119 | | ||
| 542 | ++-------------------------------+-----+ | ||
| 543 | + | ||
| 544 | +数据头后面是data_len字节的数据,根据各个cmd不同,有不同的结构 | ||
| 162 | (1)命令消息 | 545 | (1)命令消息 |
| 163 | 看ws_data.h中WSCmd_E列举值 | 546 | 看ws_data.h中WSCmd_E列举值 |
| 164 | WS_CMD_MOV_START和WS_CMD_SS_START时data为rtmp的URI | 547 | WS_CMD_MOV_START和WS_CMD_SS_START时data为rtmp的URI |
| @@ -196,7 +579,7 @@ typedef struct tagWSData_S | @@ -196,7 +579,7 @@ typedef struct tagWSData_S | ||
| 196 | } CBDContent_S; | 579 | } CBDContent_S; |
| 197 | 580 | ||
| 198 | d. 对ds_start和ss_start, | 581 | d. 对ds_start和ss_start, |
| 199 | - 返回的结构参见:WSDataWithRetCode_S,相对于,WSData_S,多了一个错误返回码。 | 582 | + 返回的结构为WSData_S后多了一个uint32_ws 的错误返回码。 |
| 200 | 错误返回值参见:tagSSRetCode_E。 | 583 | 错误返回值参见:tagSSRetCode_E。 |
| 201 | enum tagSSRetCode_E | 584 | enum tagSSRetCode_E |
| 202 | { | 585 | { |
| @@ -225,193 +608,68 @@ typedef struct tagWSData_S | @@ -225,193 +608,68 @@ typedef struct tagWSData_S | ||
| 225 | WS_RES_RTMP_CONNECT_SUC, | 608 | WS_RES_RTMP_CONNECT_SUC, |
| 226 | WS_RES_RTMP_CONNECT_FAIL, | 609 | WS_RES_RTMP_CONNECT_FAIL, |
| 227 | WS_RES_RTMP_CONNECT_CLOSED, | 610 | WS_RES_RTMP_CONNECT_CLOSED, |
| 228 | - | ||
| 229 | - | ||
| 230 | - | ||
| 231 | -3.命令类型定义: | ||
| 232 | -typedef enum tagWSCmd_E | ||
| 233 | -{ | ||
| 234 | - WS_CMD_UNKNOWN = 0, | ||
| 235 | - WS_CMD_MOV_START, | ||
| 236 | - WS_CMD_MOV_STOP, | ||
| 237 | - WS_CMD_MOV_PAUSE, | ||
| 238 | - WS_CMD_MOV_RESUME, | ||
| 239 | - WS_CMD_MOV_SEEK, | ||
| 240 | - WS_CMD_SS_START, | ||
| 241 | - WS_CMD_SS_STOP, | ||
| 242 | - WS_CMD_REC_START, | ||
| 243 | - WS_CMD_REC_STOP, | ||
| 244 | - WS_CMD_REC_PAUSE, | ||
| 245 | - WS_CMD_REC_RESUME, | ||
| 246 | - WS_CMD_REC_PUSH_AUDIO_DATA, | ||
| 247 | - WS_CMD_MOV_VERSION, | ||
| 248 | - WS_CMD_SS_VERSION, | ||
| 249 | - WS_CMD_REC_VERSION, | ||
| 250 | - WS_CMD_QAV_LOGIN, | ||
| 251 | - WS_CMD_QAV_LOGOUT, | ||
| 252 | - WS_CMD_QAV_ENTER_ROOM, | ||
| 253 | - WS_CMD_QAV_LEAVE_ROOM, | ||
| 254 | - WS_CMD_QAV_OPEN_MIC, | ||
| 255 | - WS_CMD_QAV_CLOSE_MIC, | ||
| 256 | - WS_CMD_QAV_OPEN_PLAYER, | ||
| 257 | - WS_CMD_QAV_CLOSE_PLAYER, | ||
| 258 | - WS_CMD_QAV_MUTE_AUDIO, | ||
| 259 | - WS_CMD_QAV_UNMUTE_AUDIO, | ||
| 260 | - WS_CMD_GET_MIC, | ||
| 261 | - WS_CMD_DS_START, | ||
| 262 | - WS_CMD_DS_STOP, | ||
| 263 | - WS_CMD_AUD_START, | ||
| 264 | - WS_CMD_AUD_STOP, | ||
| 265 | - WS_CMD_CONN_CLOSE, | ||
| 266 | - WS_CMD_PEN_START, | ||
| 267 | - WS_CMD_PEN_STOP, | ||
| 268 | - WS_CMD_PEN_VERSION, | ||
| 269 | - WS_CMD_QAV_DEVICE, | ||
| 270 | - WS_CMD_CBD_QUERY, | ||
| 271 | - WS_CMD_CBD_GET, | ||
| 272 | - WS_CMD_FILE_GET, | ||
| 273 | - WS_CMD_FILE_SET, | ||
| 274 | - WS_CMD_RESTART, | ||
| 275 | - WS_CMD_GET_CAM, | ||
| 276 | - WS_CMD_CAM_START, | ||
| 277 | - WS_CMD_CAM_STOP, | ||
| 278 | - WS_CMD_SWITCH_SCENE, | ||
| 279 | - WS_CMD_SHOW_UI, | ||
| 280 | - WS_CMD_SET_VIDEO_PARAM, | ||
| 281 | - WS_CMD_GET_VIDEO_PARAM, | ||
| 282 | - WS_CMD_START_RECORD, | ||
| 283 | - WS_CMD_STOP_RECORD, | ||
| 284 | - WS_CMD_START_PUSH, | ||
| 285 | - WS_CMD_STOP_PUSH, | ||
| 286 | - WS_CMD_GET_RTMP_PORT, | ||
| 287 | - WS_CMD_SET_MIC_VOL, | ||
| 288 | - WS_CMD_GET_MIC_VOL, | ||
| 289 | - WS_CMD_SET_CONFIG, | ||
| 290 | - WS_CMD_GET_CONFIG, | ||
| 291 | -}WSCmd_E;//客户端发送给liveserv的命令 | ||
| 292 | - | ||
| 293 | -typedef enum tagWSResult_E | ||
| 294 | -{ | ||
| 295 | - WS_RES_MOV_START_SUC = 0, | ||
| 296 | - WS_RES_MOV_START_FAIL, | ||
| 297 | - WS_RES_MOV_STOP_SUC, | ||
| 298 | - WS_RES_MOV_STOP_FAIL, | ||
| 299 | - WS_RES_MOV_PAUSE_SUC, | ||
| 300 | - WS_RES_MOV_PAUSE_FAIL, | ||
| 301 | - WS_RES_MOV_RESUME_SUC, | ||
| 302 | - WS_RES_MOV_RESUME_FAIL, | ||
| 303 | - WS_RES_MOV_SEEK_SUC, | ||
| 304 | - WS_RES_MOV_SEEK_FAIL, | ||
| 305 | - WS_RES_MOV_PROPERTY, | ||
| 306 | - WS_RES_SS_START_SUC, | ||
| 307 | - WS_RES_SS_START_FAIL, | ||
| 308 | - WS_RES_SS_STOP_SUC, | ||
| 309 | - WS_RES_SS_STOP_FAIL, | ||
| 310 | - WS_RES_REC_START_SUC, | ||
| 311 | - WS_RES_REC_START_FAIL, | ||
| 312 | - WS_RES_REC_STOP_SUC, | ||
| 313 | - WS_RES_REC_STOP_FAIL, | ||
| 314 | - WS_RES_REC_PAUSE_SUC, | ||
| 315 | - WS_RES_REC_PAUSE_FAIL, | ||
| 316 | - WS_RES_REC_RESUME_SUC, | ||
| 317 | - WS_RES_REC_RESUME_FAIL, | ||
| 318 | - WS_RES_MOV_PLAY_FINISH, | ||
| 319 | - WS_RES_MOV_VERSION, | ||
| 320 | - WS_RES_SS_VERSION, | ||
| 321 | - WS_RES_REC_VERSION, | ||
| 322 | - WS_RES_MOV_SELECT_FILE_CANCEL, | ||
| 323 | - WS_RES_QAV_LOGIN_SUC, | ||
| 324 | - WS_RES_QAV_LOGIN_FAIL, | ||
| 325 | - WS_RES_QAV_LOGOUT_SUC, | ||
| 326 | - WS_RES_QAV_LOGOUT_FAIL, | ||
| 327 | - WS_RES_QAV_ENTERROOM_SUC, | ||
| 328 | - WS_RES_QAV_ENTERROOM_FAIL, | ||
| 329 | - WS_RES_QAV_LEAVEROOM_SUC, | ||
| 330 | - WS_RES_QAV_LEAVEROOM_FAIL, | ||
| 331 | - WS_RES_QAV_OPEN_MIC_SUC, | ||
| 332 | - WS_RES_QAV_OPEN_MIC_FAIL, | ||
| 333 | - WS_RES_QAV_OPEN_MIC_NODEV, | ||
| 334 | - WS_RES_QAV_CLOSE_MIC_SUC, | ||
| 335 | - WS_RES_QAV_CLOSE_MIC_FAIL, | ||
| 336 | - WS_RES_QAV_CLOSE_MIC_NODEV, | ||
| 337 | - WS_RES_QAV_OPEN_PLAYER_SUC, | ||
| 338 | - WS_RES_QAV_OPEN_PLAYER_FAIL, | ||
| 339 | - WS_RES_QAV_OPEN_PLAYER_NODEV, | ||
| 340 | - WS_RES_QAV_CLOSE_PLAYER_SUC, | ||
| 341 | - WS_RES_QAV_CLOSE_PLAYER_FAIL, | ||
| 342 | - WS_RES_QAV_CLOSE_PLAYER_NODEV, | ||
| 343 | - WS_RES_QAV_MUTE_AUDIO_SUC, | ||
| 344 | - WS_RES_QAV_MUTE_AUDIO_FAIL, | ||
| 345 | - WS_RES_QAV_UNMUTE_AUDIO_SUC, | ||
| 346 | - WS_RES_QAV_UNMUTE_AUDIO_FAIL, | ||
| 347 | - WS_RES_REC_SAVE_FILE_CANCEL, | ||
| 348 | - WS_RES_GET_MIC_SUC, | ||
| 349 | - WS_RES_GET_MIC_FAIL, | ||
| 350 | - WS_RES_DS_START_SUC, | ||
| 351 | - WS_RES_DS_START_FAIL, | ||
| 352 | - WS_RES_DS_STOP_SUC, | ||
| 353 | - WS_RES_DS_STOP_FAIL, | ||
| 354 | - WS_RES_AUD_START_SUC, | ||
| 355 | - WS_RES_AUD_START_FAIL, | ||
| 356 | - WS_RES_AUD_STOP_SUC, | ||
| 357 | - WS_RES_AUD_STOP_FAIL, | ||
| 358 | - WS_RES_AUD_DATA, | ||
| 359 | - WS_RES_SS_DATA, | ||
| 360 | - WS_RES_MOV_DATA, | ||
| 361 | - WS_RES_PEN_START_SUC, | ||
| 362 | - WS_RES_PEN_START_FAIL, | ||
| 363 | - WS_RES_PEN_STOP_SUC, | ||
| 364 | - WS_RES_PEN_STOP_FAIL, | ||
| 365 | - WS_RES_PEN_VERSION, | ||
| 366 | - WS_RES_QAV_DEVICE_SUC, | ||
| 367 | - WS_RES_QAV_DEVICE_FAIL, | ||
| 368 | - WS_RES_CBD_QUERY_SUC, | ||
| 369 | - WS_RES_CBD_QUERY_FAIL, | ||
| 370 | - WS_RES_CBD_GET_SUC, | ||
| 371 | - WS_RES_CBD_GET_FAIL, | ||
| 372 | - WS_RES_FILE_GET_SUC, | ||
| 373 | - WS_RES_FILE_GET_FAIL, | ||
| 374 | - WS_RES_FILE_SET_SUC, | ||
| 375 | - WS_RES_FILE_SET_FAIL, | ||
| 376 | - WS_RES_RESTART_SUC, | ||
| 377 | - WS_RES_RESTART_FAIL, | ||
| 378 | - WS_RES_GET_CAM_SUC, | ||
| 379 | - WS_RES_GET_CAM_FAIL, | ||
| 380 | - WS_RES_CAM_START_SUC, | ||
| 381 | - WS_RES_CAM_START_FAIL, | ||
| 382 | - WS_RES_CAM_STOP_SUC, | ||
| 383 | - WS_RES_CAM_STOP_FAIL, | ||
| 384 | - WS_RES_SWITCH_SCENE_SUC, | ||
| 385 | - WS_RES_SWITCH_SCENE_FAIL, | ||
| 386 | - WS_RES_PUSH_STREAM_FAIL, | ||
| 387 | - WS_RES_SHOW_UI_SUC, | ||
| 388 | - WS_RES_SET_VIDEO_PARAM_SUC, | ||
| 389 | - WS_RES_SET_VIDEO_PARAM_FAIL, | ||
| 390 | - WS_RES_GET_VIDEO_PARAM_SUC, | ||
| 391 | - WS_RES_GET_VIDEO_PARAM_FAIL, | ||
| 392 | - WS_RES_START_RECORD_SUC, | ||
| 393 | - WS_RES_START_RECORD_FAIL, | ||
| 394 | - WS_RES_STOP_RECORD_SUC, | ||
| 395 | - WS_RES_STOP_RECORD_FAIL, | ||
| 396 | - WS_RES_START_PUSH_SUC, | ||
| 397 | - WS_RES_START_PUSH_FAIL, | ||
| 398 | - WS_RES_STOP_PUSH_SUC, | ||
| 399 | - WS_RES_STOP_PUSH_FAIL, | ||
| 400 | - WS_RES_GET_RTMP_PORT_SUC, | ||
| 401 | - WS_RES_GET_RTMP_PORT_FAIL, | ||
| 402 | - WS_RES_SET_MIC_VOL_SUC, | ||
| 403 | - WS_RES_SET_MIC_VOL_FAIL, | ||
| 404 | - WS_RES_GET_MIC_VOL_SUC, | ||
| 405 | - WS_RES_GET_MIC_VOL_FAIL, | ||
| 406 | - WS_RES_RTMP_CONNECTING, | ||
| 407 | - WS_RES_RTMP_CONNECT_SUC, | ||
| 408 | - WS_RES_RTMP_CONNECT_FAIL, | ||
| 409 | - WS_RES_RTMP_CONNECT_CLOSED, | ||
| 410 | - WS_RES_SET_CONFIG_SUC, | ||
| 411 | - WS_RES_SET_CONFIG_FAIL, | ||
| 412 | - WS_RES_GET_CONFIG_SUC, | ||
| 413 | - WS_RES_GET_CONFIG_FAIL, | ||
| 414 | -}WSResult_E;//liveserv返回客户端的结果,状态 | 611 | + |
| 612 | + g.WS_RES_EXT_INPUT,罗博智能笔输入命令: | ||
| 613 | + 打开输入, data_len=1 data[0]=0 | ||
| 614 | + 关闭输入,data_len=1 data[0]=1 | ||
| 615 | + 旋转输入坐标90度,data_len=1 data[0]=2 | ||
| 616 | + | ||
| 617 | + WS_RES_EXT_INPUT,罗博智能笔输入状态: | ||
| 618 | + | ||
| 619 | +data | ||
| 620 | ++---------+--------------------------+ | ||
| 621 | +| 1byte | var length | | ||
| 622 | ++---------+--------------------------+ | ||
| 623 | +| type | content | | ||
| 624 | ++---------+--------------------------+ | ||
| 625 | +type = 1 | ||
| 626 | ++---------+------------+ | ||
| 627 | +| 2byte | 2byte | | ||
| 628 | ++---------+------------+ | ||
| 629 | +| width | height | | ||
| 630 | ++---------+------------+ | ||
| 631 | +type = 2 | ||
| 632 | ++---------+------------+------------+ | ||
| 633 | +| 2byte | 2byte | 2byte | | ||
| 634 | ++---------+------------+------------+ | ||
| 635 | +| presss | x | y | | ||
| 636 | ++---------+------------+------------+ | ||
| 637 | + | ||
| 638 | +type = 3 | ||
| 639 | ++------------+ | ||
| 640 | +| 1byte | | ||
| 641 | ++------------+ | ||
| 642 | +| status | | ||
| 643 | ++------------+ | ||
| 644 | + | ||
| 645 | +status: | ||
| 646 | ++---------+-----------------+ | ||
| 647 | +| 值 | 状态 | | ||
| 648 | ++---------+-----------------+ | ||
| 649 | +| 0 | 设备未连接 | | ||
| 650 | ++---------+-----------------+ | ||
| 651 | +| 1 | 设备打开成功 | | ||
| 652 | ++---------+-----------------+ | ||
| 653 | +| 2 | 设备关闭 | | ||
| 654 | ++---------+-----------------+ | ||
| 655 | +| 3 | 设备打开失败 | | ||
| 656 | ++---------+-----------------+ | ||
| 657 | +| 4 | 蓝牙设备未连接 | | ||
| 658 | ++---------+-----------------+ | ||
| 659 | +| 5 | 蓝牙待机 | | ||
| 660 | ++---------+-----------------+ | ||
| 661 | +| 6 | 蓝牙扫描中 | | ||
| 662 | ++---------+-----------------+ | ||
| 663 | +| 7 | 蓝牙连接中 | | ||
| 664 | ++---------+-----------------+ | ||
| 665 | +| 8 | 蓝牙连接成功 | | ||
| 666 | ++---------+-----------------+ | ||
| 667 | +| 9 | 蓝牙断开中 | | ||
| 668 | ++---------+-----------------+ | ||
| 669 | +| 10 | 蓝牙重连中 | | ||
| 670 | ++---------+-----------------+ | ||
| 671 | + | ||
| 672 | + | ||
| 415 | 673 | ||
| 416 | config.ini说明 | 674 | config.ini说明 |
| 417 | ;livemgr服务配置项 | 675 | ;livemgr服务配置项 |
| @@ -18,20 +18,16 @@ | @@ -18,20 +18,16 @@ | ||
| 18 | 18 | ||
| 19 | 19 | ||
| 20 | 版本 1.0.3 | 20 | 版本 1.0.3 |
| 21 | - | ||
| 22 | 1.支持SmartPublisherSDK在共享屏幕时,采集音频 | 21 | 1.支持SmartPublisherSDK在共享屏幕时,采集音频 |
| 23 | - | ||
| 24 | 2.支持wss连接,通过LiveServ.WSS_PORT配置 | 22 | 2.支持wss连接,通过LiveServ.WSS_PORT配置 |
| 25 | - | ||
| 26 | 3.取消共享时推送缺省流到本地rtmp服务器(可配置) | 23 | 3.取消共享时推送缺省流到本地rtmp服务器(可配置) |
| 27 | - | ||
| 28 | 4.添加get_config,set_config,用于获取和修改配置项 | 24 | 4.添加get_config,set_config,用于获取和修改配置项 |
| 29 | - | ||
| 30 | - | ||
| 31 | -版本 1.0.4 | ||
| 32 | - | ||
| 33 | -1.修改Security.PORT配置项不起作用的bug | ||
| 34 | 25 | ||
| 35 | -2.修改win10下,系统显示设置为高DPI时,屏幕捕获不完整 | 26 | +版本 1.0.4 |
| 27 | +1.修改Security.PORT配置项不起作用的bug | ||
| 28 | +2.修改win10下,系统显示设置为高DPI时,屏幕捕获不完整 | ||
| 29 | +3.修改bug: win10下,如果系统无摄像头,获取摄像头设备时会程序异常 | ||
| 36 | 30 | ||
| 37 | -3.修改bug: win10下,如果系统无摄像头,获取摄像头设备时会程序异常 | ||
| 31 | +版本 1.0.5 | ||
| 32 | +1.修改跨域安全策略模块初始化时会阻塞主线程的问题,会影响QAV SDK相关命令的执行 | ||
| 33 | +2.支持罗博T7智写板输入 |
files/RobotUsbWrapper.dll
0 → 100644
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
不能预览此文件类型
-
请 注册 或 登录 后发表评论