18 Commits (d7047b5d5ef44ec3795687bc7b1620c3b2132c3a)
 

Author SHA1 Message Date
  耀 d7047b5d5e Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 e5791061e4 zhao:增加增加暂停功能,多视频录制合并 4 years ago
  zhangxueyang af14813ae0 画笔颜色 粗细 样式。 4 years ago
  耀 fbf9789e1b Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 a956170188 zhao:1增加录音方法,2增加视频格式 4 years ago
  zhangxueyang 1355aaab46 BUG 4 years ago
  耀 e9e374ff94 zhao:解决冲突 4 years ago
  耀 6c2bc0ad3b zhao:增加保存UI内容为图片 增加图片音频合成视频 4 years ago
  zhangxueyang f209fd72e3 UI 4 years ago
  耀 db2ab6ead8 Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  zhangxueyang 162c736c9f 删除bin obj 4 years ago
  zhangxueyang f68ea88799 文件 4 years ago
  耀 d7cf544f0c Merge remote-tracking branch 'origin/zxy' into zyy 4 years ago
  耀 6141326234 zhao:去除bin obj 4 years ago
  zhangxueyang de23c59911 主页面 4 years ago
  耀 2c05040d9c zy: 4 years ago
  耀 9863d1c004 zy: 4 years ago
  耀 3521f70df4 zhao:提交框架 4 years ago