drag and drop
change hisimedia
add heart
drop and drag
add connect timeout
start heart
start video
Merge branch 'dev' of 192.168.40.183:P2PSystem into dev
start and stop audio of hisi device
Merge branch 'dev' of 192.168.40.183:P2PSystem into dev
set division change again
logout
logout ok
add mk
change jni callvoidmethod
aaa
Merge branch 'dev' of 192.168.40.183:P2PSystem into dev
bbb
ccc
ddd