分支修改8.3

添加了注释，演示
master的更新

测试演示
Merge branch '刘任驰‘分支'

Conflicts:
	IStone_911.xcworkspace/xcshareddata/IStone_911.xccheckout

IStone_911.xcworkspace/xcuserdata/lrcray.xcuserdatad/UserInterfaceState.
xcuserstate
test

test
祥林分支修改
master 更新
Merge branch '蒋祥林‘分支'

Conflicts:

IStone_911.xcworkspace/xcuserdata/Zhilin.xcuserdatad/UserInterfaceState.
xcuserstate
2 _master同步更新
test

test
master_test2
祥林分支同步
祥林分支同步_2
master test_2
Merge branch '蒋祥林‘分支'

Conflicts:

IStone_911.xcworkspace/xcuserdata/Xianglin.xcuserdatad/UserInterfaceStat
e.xcuserstate
8-6分支修改

增加了视频录制本地视频读取
commit

撤销
Revert "commit"

This reverts commit f7e1310cca6bf24cacf7c443648c9e1cdef6eb08.
Revert "Merge branch '蒋祥林‘分支'"

This reverts commit 87a7f9c43f659dbdc1e30b05bc3b231361db325c, reversing
changes made to 4a31684e493eda7cb5dbe9ab59c363d099661616.
8-6合并前备份

未添加刘任驰‘分支
8-6最新master。

添加了基本的视频录制还有基本的本地视频读取