{"push_id":2490753295,"size":3,"distinct_size":3,"ref":"refs/heads/master","head":"a1474381e63453637f2187dfa2fff28a7543e2fa","before":"22c97e614e7b43b5304d30b7374a76195ea900c5","commits":[{"sha":"757f549b88c6fa7ab1e2b89ae958828522f84f55","author":{"name":"xkazerzhang","email":"a8fd0f049f080a6692fc6102812e27fb2c1d251a@tencent.com"},"message":"Squashed commit of the following:\n\ncommit 89ed1ea361b1cd3f24ad1344ba24f3fc094c9b5b\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 17 15:46:57 2018 +0800\n\n    更新sdk版本\n\ncommit b2c050751f00fd5848ef65534347d28e141ce2ed\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 17 15:46:03 2018 +0800\n\n    修复测速异常\n\ncommit d3cb99b7ca720542477d88a23327d4f57e100c15\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 10 16:36:49 2018 +0800\n\n    移除分享功能\n\ncommit c8c5452d85eca48d361ccc860ef0a83e75f88b77\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 10 15:28:33 2018 +0800\n\n    更新播放器\n\ncommit fdd9c35b171275e27318b956512913ed9cbd8c60\nAuthor: xkazer <xkazer@sina.com>\nDate:   Sun Apr 8 16:34:21 2018 +0800\n\n    优化闪光灯\n\ncommit 04f7b0b5d32fc1589cddb47070135aef506bffe2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Sun Apr 8 16:16:05 2018 +0800\n\n    升级美颜功能\n\ncommit 3a4a6b6f9b751799e310a1c5c4a1a7b208a4dac1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jan 25 15:54:25 2018 +0800\n\n    更新动效实现\n\ncommit dacd6a6ee3405cf002bb11c75a85a6c73f16727a\nAuthor: jasonxiao <jasonxiao@tencent.com>\nDate:   Wed Nov 15 10:32:45 2017 +0800\n\n    修改测速\n\ncommit b20c33be7310611f6d218a06ffa47955dc7ccb6c\nAuthor: jasonxiao <jasonxiao@tencent.com>\nDate:   Tue Nov 14 14:13:10 2017 +0800\n\n    修改测速功能\n\ncommit ce40f524c687b5f63714fd7d3504baec1899268d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 16:52:20 2017 +0800\n\n    同步默认封面展示\n\ncommit 2afe6b5607e8d80bbe98e2c34bc492e54752adfd\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 15:57:36 2017 +0800\n\n    与iOS统一布局展示\n\ncommit 0757ee60a75d759855a3f1762d0ded56500ed957\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 14:48:36 2017 +0800\n\n    更新ilivesdk版本\n\ncommit acc5a26bce34d3ea765329661ad65c170f3ab843\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Nov 3 12:46:57 2017 +0800\n\n    修正版本中测试环境展示\n\ncommit e898c813a3bcdbf16e26e6335bbbb98001e7b920\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Nov 3 11:42:23 2017 +0800\n\n    优化版本展示\n\ncommit f204a40dacb39aad431356dff0cd184adf018538\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Oct 30 17:43:20 2017 +0800\n\n    更新随心播版本\n\ncommit 8d62085d4b679764c2a33bdc8b257d3bd5d3bfdd\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Oct 17 18:00:11 2017 +0800\n\n    更新美颜sdk\n\ncommit d153ef2767dc0ba027e8f6a9aab85dd7788a5bed\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Sep 13 11:29:18 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit 3212c1e4f4a976e94284e3a465c02bb8853945b8\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Sep 1 18:16:19 2017 +0800\n\n    优化退房间逻辑\n\ncommit 1ae1f6ebd8f2968103c916fb9e4bd5be1efd92d5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Sep 1 17:37:21 2017 +0800\n\n    优化美颜，token过期处理\n\ncommit 227e3f3f54d16d54661fd3e12fc3e6e17e413272\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 22 14:29:39 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit fae64d8e894c422e1ab37aa8b5904090541a22db\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 8 10:57:54 2017 +0800\n\n    添加管理员踢人逻辑\n\ncommit 5e7447987f8d0b86d431bbc007cddf3c507b27ba\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 17:50:48 2017 +0800\n\n    移除闪屏优化\n\ncommit 8499189bc45a6e0d546580d8b295770d2d79669c\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 16:37:46 2017 +0800\n\n    过滤WebRTC房间\n\ncommit 34d1d025bd89f990ebdea4a3a84e6921d17926e2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 16:37:22 2017 +0800\n\n    进房间重置美颜\n\ncommit 7933913bbe7c39189ad06a78e951eb7595c4d76f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:26:52 2017 +0800\n\n    添加用户名特殊字符检测\n\ncommit 2f79bf9076a35a1a8d6a40b4e2e77972c901403d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:19:04 2017 +0800\n\n    重新添加图片\n\ncommit 08f16a3ada6b64e5e80b2f55eb16f34b9859261d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:18:34 2017 +0800\n\n    移除图片\n\ncommit 4a71ea2e488016b50cf7652a0d977c9668d6e040\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:11:02 2017 +0800\n\n    添加背景图像\n\ncommit 9ef168ac76cc2f40041c2e4ba2ae875fcee2a4c4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 11:36:03 2017 +0800\n\n    移除旋转，开关滤镜黑屏\n\ncommit d7648dd47a5920915f6a40755b73b7b5ab03f8cc\nMerge: 73167bd b6d0c9d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:20:18 2017 +0800\n\n    Merge branch 'dev' of http://git.code.oa.com/openAndroid/iLiveSDK_Suixinbo into dev\n\ncommit 73167bd5b9394cf65fd29d06c0a9e1ec5f05433e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:19:39 2017 +0800\n\n    优化闪屏问题\n\ncommit b6d0c9d82821c9ad7a3225ea44a534f0a1afa6a1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:00:47 2017 +0800\n\n    添加滤镜时添加闪屏优化\n\ncommit ab6c3ce9dad6b218d5167b2e0d0293d8a64f722e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 16:28:17 2017 +0800\n\n    修复7.0以上某些机型上传封面时异常\n\ncommit b0f5b16e4c54207e1decc08d030f1231477a9ab6\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 11:03:41 2017 +0800\n\n    更新主播头像\n\ncommit 7ee55f3a458e4fc084fd46f805e680dd2c0d5497\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 10:45:19 2017 +0800\n\n    屏蔽调试代码\n\ncommit 7f8709d923dd1364bc2bcaaec4029e5cbaef7b4e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 10:43:29 2017 +0800\n\n    优化消息与房间信息布局\n\ncommit 9a02a3757308fcfe7e1181430fef6978254f494e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 20:20:07 2017 +0800\n\n    主播关闭旋转\n\ncommit 2a0e364162402593c66623e09941d83fd683618b\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 15:53:13 2017 +0800\n\n    关闭额外房间信息展示\n\ncommit 80f29027df8d06f87d4c9e7ef139ab3cc73cedfc\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 14:45:38 2017 +0800\n\n    修复直播中被踢换帐号后提示恢复\n\ncommit 6900748ef314a24d727c445b2919ada49960a273\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 14:45:07 2017 +0800\n\n    优化主播退出观众提示\n\ncommit 327b984e83dafde37b33800baf75d10406cf98b2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 10:34:35 2017 +0800\n\n    优化帐号被踢提示信息\n\ncommit 06a0c65489c8167d546cb9e6a50d1313762f9474\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 09:59:21 2017 +0800\n\n    修复录制回放数量填空异常问题\n\ncommit 7a8a903bcd9d5eb02a352808488507b683768a14\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 20:10:46 2017 +0800\n\n    修复推流名称删除后无法输入\n\ncommit fbd91f9ebca9af4f98c9549e48fdee14f0116e16\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 20:10:29 2017 +0800\n\n    修复麦克风无法关闭\n\ncommit ea099f2a253f42ee0797eff68d6049002f81ef4d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 16:03:31 2017 +0800\n\n    修复注销后登录签名为空问题\n\ncommit d9477e92378c8781da2939d824126b6cb9eb50b4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:51:34 2017 +0800\n\n    优化用户名与密码格式检测\n\ncommit e3df01b6a7377197dec27ff3979b0f0b1188df9e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:36:29 2017 +0800\n\n    修复测速异常\n    登录失败只清空密码\n\ncommit 817fa6d1d469bdf8d9709ab97a178fdf1de9dbee\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:08:29 2017 +0800\n\n    更新iLiveSDK修复加入房间异常问题\n\ncommit 00d6047dc5e817ce6debf223bdf7e24dcc10727c\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 1 17:47:40 2017 +0800\n\n    更新到iLiveSDK 1.5.3.0.7(日志统一格式版本)\n\ncommit 8b71c7aacbef45cce6428545d9b0b1a915554a59\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 28 10:17:26 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit 2294bb1bd37326c9d7e623c810b3436fe9a667e7\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 14 19:26:08 2017 +0800\n\n    更新美颜版本\n\ncommit 8b6fd29835677b05395631030245c4be52598720\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 14 17:50:20 2017 +0800\n\n    优化直播及回放列表显示，添加用户头像展示\n\ncommit cf74d448298fc8a682d13d2567f04a1e651f4076\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jul 13 10:00:31 2017 +0800\n\n    优化主页显示(仿iOS界面)\n\ncommit 7cd1c76d787ccee6f4ac53b46809d03c6c2837a2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Jul 12 20:11:08 2017 +0800\n\n    优化主页TAB显示\n\ncommit 709cb2f323815254c54e038e49b9a3ded78cd6fa\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Jul 12 15:32:45 2017 +0800\n\n    优化录制时长显示格式\n\ncommit bdbed50151584022654f2847e4e19390bf0c4dbe\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 20:15:30 2017 +0800\n\n    录制回放添加用户名搜索功能\n\ncommit 5e461ffb6b1b8e8dd1e6f464221d5593efc52585\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 17:18:21 2017 +0800\n\n    优化录制回放界面展示\n\ncommit 880297356da46e2e2009b6b2e07bebed9bec71b3\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 12:32:43 2017 +0800\n\n    优化录制回放列表显示\n\ncommit d5f74a9269d4e08f03535d556b676d9467ec51f1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jul 6 11:21:48 2017 +0800\n\n    优化回放列表展示\n\ncommit 03114bce0713af3256e0637b425a2ebab9d5378a\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 27 20:05:37 2017 +0800\n\n    恢复主播角色\n\ncommit e279c3699c96ea009dc3b197b8e6cf01367782f5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 27 19:03:44 2017 +0800\n\n    添加anchor角色\n\ncommit 08665da227c280b4e80798615e7f18833c2f50be\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 13 09:47:10 2017 +0800\n\n    更新ILiveSDK版本1.5.0\n\ncommit f98e141bd4bc5de2a179ee7e1379a927283a089d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jun 2 16:41:42 2017 +0800\n\n    优化编译脚本\n\ncommit 69108228370553863b7c1077d13617d4b894539f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jun 2 16:31:40 2017 +0800\n\n    设置中添加日志上报\n\ncommit 274d487eec4983aded3b2af1746ee688a91016da\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 18:11:25 2017 +0800\n\n    修正美颜标题\n\ncommit 961cb7b89572c6806a7a722939e4c385f0891b20\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:45:15 2017 +0800\n\n    修正日志标题\n\ncommit fa67c0d644bc0429ea87fa48d779552c8bc976cb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:42:33 2017 +0800\n\n    优化按钮\n\ncommit 4b1cc9961fa05bb9e55b0b99bdf2fe27ccc84792\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:39:48 2017 +0800\n\n    统一个人界面\n\ncommit 897e1bf7043cba4761a38b6e4e1e5bb984e529f9\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 15:28:51 2017 +0800\n\n    优化美颜配置界面\n\ncommit 08460bf9a25332c307af04b4fb8f31a9f2cf9fc1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 15:09:58 2017 +0800\n\n    添加观众模式配置\n\ncommit 4fe00a3513cb7360968e6d8aa3f945d06f4b94cc\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 10:27:48 2017 +0800\n\n    修复上麦观众无法关闭麦克风问题\n\ncommit c4021052c8a5a5abe78f933c4f937753a9df80ea\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 09:43:44 2017 +0800\n\n    添加创建房间角色配置\n\ncommit feb2a13e16914e3392879b32d052030722c64594\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 10:39:36 2017 +0800\n\n    优化随心播，添加异常保护\n\ncommit baef1c485fefd6ff78a5c4945587ccd3c5664778\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 09:47:41 2017 +0800\n\n    添加空指针保护\n\ncommit 47c956c2aa12559a1344d857f5e53f561c4d9689\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 09:42:12 2017 +0800\n\n    添加保护\n\ncommit f0d9061d08e94aef7572394bc18e7ebd44b7b558\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Apr 24 15:30:59 2017 +0800\n\n    优化录制界面展示\n\ncommit 46e1e60f851ace7bb7de6308203532a244f765bf\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 19:33:40 2017 +0800\n\n    大屏也全屏显示\n\ncommit 9ed84d7192c15e25d6bfc432b12d872188800c7e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 18:00:15 2017 +0800\n\n    默认全屏显示\n\ncommit 944ba215a7175d1ef2ca5072016ab58f97ee2dca\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 17:57:25 2017 +0800\n\n    修正跨房数量限制，屏蔽ILive美颜\n\ncommit be92403e3494a700804758363e77025fd7bec2f9\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 17:51:21 2017 +0800\n\n    优化界面显示\n\ncommit bf68f8fb89ab7fc33cef0c8dc66e905d354ded98\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 16:43:17 2017 +0800\n\n    添加日志上报格式限制\n\ncommit 4b1045dbbca0c66a19cd42c7af1e8cae03d23b5f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 15:54:25 2017 +0800\n\n    修正观众快速切换房间\n\ncommit 0124bc4524c748b8344068df2edc274d3e36ade5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 14:37:43 2017 +0800\n\n    添加日志上报对话框\n\ncommit 74a5cd070666f258e0c1ca9bf7cc8fee1d79fc24\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:53:52 2017 +0800\n\n    退房间时取消跨房连麦\n\ncommit 939aed1590c43ae031702be4075f17533da9adfe\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:44:24 2017 +0800\n\n    添加进房间失败提示\n\ncommit 1aa82838d42d2af57b1136f14fd53ed70b2945d1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:41:25 2017 +0800\n\n    优化消息信令逻辑\n\ncommit 420d39822f7d38546fbf22084e67791b0f0abdf4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:44:57 2017 +0800\n\n    进房间重置滤镜及美颜效果\n\ncommit 080177ab128b16808a76132ef586822362c1f15d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:18:37 2017 +0800\n\n    修复回到上次直播提示不能取消问题\n\ncommit cdfd7c630f60d27ed31cb2b5d1b5b2cc2269810b\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:05:39 2017 +0800\n\n    修复Android 4.4以上对话框被状态栏挡住问题\n\ncommit 15282d68d98423654baf7ed98543fdcc265f8451\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 17:46:42 2017 +0800\n\n    添加ILive美颜实现\n\ncommit 6c9de955fe376c0236d8c6743330782f27357ea8\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 16:30:42 2017 +0800\n\n    锁定单选对话框风格\n    添加美颜类型配置\n\ncommit b5eb44742980cf03f31af953e1be98f867b79898\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:44:38 2017 +0800\n\n    修复日志上报失败出现异常\n\ncommit a1baa3ece785d7b4adf35a111efab008aa93115e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:41:16 2017 +0800\n\n    优化直播上部菜单栏布局\n\ncommit 160e99d09c58d116f0f9d0392093a7bfe2bdc698\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:17:18 2017 +0800\n\n    更新直播选择界面为单选对话框\n\ncommit fff8450fa1fbfc9ae99b835ffc407422630d84cb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 09:43:52 2017 +0800\n\n    修正部分手机上布局问题\n\ncommit 7eebd4572bedcc86f3fd316fc8e8cf82e21614b7\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 09:21:17 2017 +0800\n\n    修正变声菜单与实际不匹配问题\n\ncommit a57816173971fd365c39961ecf9e6c73dfddbd74\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 20:20:23 2017 +0800\n\n    修改随心播直播间页面布局\n\ncommit 31be0d2b3f51dd710c58f48d254cdae4ac7f6923\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 16:30:50 2017 +0800\n\n    添加跨房连麦列表选择\n\ncommit ebcadc71eb851ff4ec181ad1a20ba9b16248adb4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 11:50:21 2017 +0800\n\n    修复异常\n\ncommit 7243593a07a19002ad7809a3259d4f5fa4e8efb6\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 18 17:57:25 2017 +0800\n\n    修复观众也有跨房连麦入口问题\n\ncommit 30b5d8d307426f9357aa43cf219d8fd2968086e2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 18 09:11:46 2017 +0800\n\n    界面优化\n\ncommit b3b48b569d103e98c920989453ca3ae876888323\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Apr 17 17:04:14 2017 +0800\n\n    添加滤镜/脸萌效果\n\ncommit e6c1d4e4f4b81536925f10f2ce8850b98a4a6912\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 13 20:13:42 2017 +0800\n\n    跨房连麦功能演示\n\ncommit c60816ad2ac8bb08f6e6c2153977ce226616308f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 13 11:17:36 2017 +0800\n\n    更新ILiveSDK版本\n\ncommit 1228f00e01b8615fbe35c7a395ee9261ed2a2faa\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:22:40 2017 +0800\n\n    修正RDM构建的脚本\n\ncommit 42af344b8ecd2b6726c2859b5e8a8e558985bbcb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:17:42 2017 +0800\n\n    添加RDM构建脚本\n\ncommit 954b3c39963117112881d61c2a814708998d95a4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:11:29 2017 +0800\n\n    更新1.3.4.9(IMSDK 2.5.3)版本\n\n# Conflicts:\n#\tapp/build.gradle\n#\tapp/src/main/AndroidManifest.xml\n#\tapp/src/main/java/com/tencent/qcloud/suixinbo/views/LiveActivity.java\n#\tbuild.gradle\n#\tgradle.properties","distinct":true,"url":"https://api.github.com/repos/zhaoyang21cn/iLiveSDK_Android_Suixinbo/commits/757f549b88c6fa7ab1e2b89ae958828522f84f55"},{"sha":"c84731005667c6c7924e6855823c4a9536b7b6ec","author":{"name":"xkazerzhang","email":"a8fd0f049f080a6692fc6102812e27fb2c1d251a@tencent.com"},"message":"Squashed commit of the following:\n\ncommit 89ed1ea361b1cd3f24ad1344ba24f3fc094c9b5b\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 17 15:46:57 2018 +0800\n\n    更新sdk版本\n\ncommit b2c050751f00fd5848ef65534347d28e141ce2ed\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 17 15:46:03 2018 +0800\n\n    修复测速异常\n\ncommit d3cb99b7ca720542477d88a23327d4f57e100c15\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 10 16:36:49 2018 +0800\n\n    移除分享功能\n\ncommit c8c5452d85eca48d361ccc860ef0a83e75f88b77\nAuthor: xkazerzhang <xkazerzhang@tencent.com>\nDate:   Tue Apr 10 15:28:33 2018 +0800\n\n    更新播放器\n\ncommit fdd9c35b171275e27318b956512913ed9cbd8c60\nAuthor: xkazer <xkazer@sina.com>\nDate:   Sun Apr 8 16:34:21 2018 +0800\n\n    优化闪光灯\n\ncommit 04f7b0b5d32fc1589cddb47070135aef506bffe2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Sun Apr 8 16:16:05 2018 +0800\n\n    升级美颜功能\n\ncommit 3a4a6b6f9b751799e310a1c5c4a1a7b208a4dac1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jan 25 15:54:25 2018 +0800\n\n    更新动效实现\n\ncommit dacd6a6ee3405cf002bb11c75a85a6c73f16727a\nAuthor: jasonxiao <jasonxiao@tencent.com>\nDate:   Wed Nov 15 10:32:45 2017 +0800\n\n    修改测速\n\ncommit b20c33be7310611f6d218a06ffa47955dc7ccb6c\nAuthor: jasonxiao <jasonxiao@tencent.com>\nDate:   Tue Nov 14 14:13:10 2017 +0800\n\n    修改测速功能\n\ncommit ce40f524c687b5f63714fd7d3504baec1899268d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 16:52:20 2017 +0800\n\n    同步默认封面展示\n\ncommit 2afe6b5607e8d80bbe98e2c34bc492e54752adfd\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 15:57:36 2017 +0800\n\n    与iOS统一布局展示\n\ncommit 0757ee60a75d759855a3f1762d0ded56500ed957\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Nov 13 14:48:36 2017 +0800\n\n    更新ilivesdk版本\n\ncommit acc5a26bce34d3ea765329661ad65c170f3ab843\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Nov 3 12:46:57 2017 +0800\n\n    修正版本中测试环境展示\n\ncommit e898c813a3bcdbf16e26e6335bbbb98001e7b920\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Nov 3 11:42:23 2017 +0800\n\n    优化版本展示\n\ncommit f204a40dacb39aad431356dff0cd184adf018538\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Oct 30 17:43:20 2017 +0800\n\n    更新随心播版本\n\ncommit 8d62085d4b679764c2a33bdc8b257d3bd5d3bfdd\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Oct 17 18:00:11 2017 +0800\n\n    更新美颜sdk\n\ncommit d153ef2767dc0ba027e8f6a9aab85dd7788a5bed\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Sep 13 11:29:18 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit 3212c1e4f4a976e94284e3a465c02bb8853945b8\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Sep 1 18:16:19 2017 +0800\n\n    优化退房间逻辑\n\ncommit 1ae1f6ebd8f2968103c916fb9e4bd5be1efd92d5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Sep 1 17:37:21 2017 +0800\n\n    优化美颜，token过期处理\n\ncommit 227e3f3f54d16d54661fd3e12fc3e6e17e413272\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 22 14:29:39 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit fae64d8e894c422e1ab37aa8b5904090541a22db\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 8 10:57:54 2017 +0800\n\n    添加管理员踢人逻辑\n\ncommit 5e7447987f8d0b86d431bbc007cddf3c507b27ba\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 17:50:48 2017 +0800\n\n    移除闪屏优化\n\ncommit 8499189bc45a6e0d546580d8b295770d2d79669c\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 16:37:46 2017 +0800\n\n    过滤WebRTC房间\n\ncommit 34d1d025bd89f990ebdea4a3a84e6921d17926e2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 16:37:22 2017 +0800\n\n    进房间重置美颜\n\ncommit 7933913bbe7c39189ad06a78e951eb7595c4d76f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:26:52 2017 +0800\n\n    添加用户名特殊字符检测\n\ncommit 2f79bf9076a35a1a8d6a40b4e2e77972c901403d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:19:04 2017 +0800\n\n    重新添加图片\n\ncommit 08f16a3ada6b64e5e80b2f55eb16f34b9859261d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:18:34 2017 +0800\n\n    移除图片\n\ncommit 4a71ea2e488016b50cf7652a0d977c9668d6e040\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 15:11:02 2017 +0800\n\n    添加背景图像\n\ncommit 9ef168ac76cc2f40041c2e4ba2ae875fcee2a4c4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 11:36:03 2017 +0800\n\n    移除旋转，开关滤镜黑屏\n\ncommit d7648dd47a5920915f6a40755b73b7b5ab03f8cc\nMerge: 73167bd b6d0c9d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:20:18 2017 +0800\n\n    Merge branch 'dev' of http://git.code.oa.com/openAndroid/iLiveSDK_Suixinbo into dev\n\ncommit 73167bd5b9394cf65fd29d06c0a9e1ec5f05433e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:19:39 2017 +0800\n\n    优化闪屏问题\n\ncommit b6d0c9d82821c9ad7a3225ea44a534f0a1afa6a1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Aug 7 10:00:47 2017 +0800\n\n    添加滤镜时添加闪屏优化\n\ncommit ab6c3ce9dad6b218d5167b2e0d0293d8a64f722e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 16:28:17 2017 +0800\n\n    修复7.0以上某些机型上传封面时异常\n\ncommit b0f5b16e4c54207e1decc08d030f1231477a9ab6\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 11:03:41 2017 +0800\n\n    更新主播头像\n\ncommit 7ee55f3a458e4fc084fd46f805e680dd2c0d5497\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 10:45:19 2017 +0800\n\n    屏蔽调试代码\n\ncommit 7f8709d923dd1364bc2bcaaec4029e5cbaef7b4e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Aug 4 10:43:29 2017 +0800\n\n    优化消息与房间信息布局\n\ncommit 9a02a3757308fcfe7e1181430fef6978254f494e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 20:20:07 2017 +0800\n\n    主播关闭旋转\n\ncommit 2a0e364162402593c66623e09941d83fd683618b\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 15:53:13 2017 +0800\n\n    关闭额外房间信息展示\n\ncommit 80f29027df8d06f87d4c9e7ef139ab3cc73cedfc\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 14:45:38 2017 +0800\n\n    修复直播中被踢换帐号后提示恢复\n\ncommit 6900748ef314a24d727c445b2919ada49960a273\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 14:45:07 2017 +0800\n\n    优化主播退出观众提示\n\ncommit 327b984e83dafde37b33800baf75d10406cf98b2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 10:34:35 2017 +0800\n\n    优化帐号被踢提示信息\n\ncommit 06a0c65489c8167d546cb9e6a50d1313762f9474\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Aug 3 09:59:21 2017 +0800\n\n    修复录制回放数量填空异常问题\n\ncommit 7a8a903bcd9d5eb02a352808488507b683768a14\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 20:10:46 2017 +0800\n\n    修复推流名称删除后无法输入\n\ncommit fbd91f9ebca9af4f98c9549e48fdee14f0116e16\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 20:10:29 2017 +0800\n\n    修复麦克风无法关闭\n\ncommit ea099f2a253f42ee0797eff68d6049002f81ef4d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 16:03:31 2017 +0800\n\n    修复注销后登录签名为空问题\n\ncommit d9477e92378c8781da2939d824126b6cb9eb50b4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:51:34 2017 +0800\n\n    优化用户名与密码格式检测\n\ncommit e3df01b6a7377197dec27ff3979b0f0b1188df9e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:36:29 2017 +0800\n\n    修复测速异常\n    登录失败只清空密码\n\ncommit 817fa6d1d469bdf8d9709ab97a178fdf1de9dbee\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Aug 2 15:08:29 2017 +0800\n\n    更新iLiveSDK修复加入房间异常问题\n\ncommit 00d6047dc5e817ce6debf223bdf7e24dcc10727c\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Aug 1 17:47:40 2017 +0800\n\n    更新到iLiveSDK 1.5.3.0.7(日志统一格式版本)\n\ncommit 8b71c7aacbef45cce6428545d9b0b1a915554a59\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 28 10:17:26 2017 +0800\n\n    更新iLiveSDK版本\n\ncommit 2294bb1bd37326c9d7e623c810b3436fe9a667e7\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 14 19:26:08 2017 +0800\n\n    更新美颜版本\n\ncommit 8b6fd29835677b05395631030245c4be52598720\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jul 14 17:50:20 2017 +0800\n\n    优化直播及回放列表显示，添加用户头像展示\n\ncommit cf74d448298fc8a682d13d2567f04a1e651f4076\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jul 13 10:00:31 2017 +0800\n\n    优化主页显示(仿iOS界面)\n\ncommit 7cd1c76d787ccee6f4ac53b46809d03c6c2837a2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Jul 12 20:11:08 2017 +0800\n\n    优化主页TAB显示\n\ncommit 709cb2f323815254c54e038e49b9a3ded78cd6fa\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Jul 12 15:32:45 2017 +0800\n\n    优化录制时长显示格式\n\ncommit bdbed50151584022654f2847e4e19390bf0c4dbe\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 20:15:30 2017 +0800\n\n    录制回放添加用户名搜索功能\n\ncommit 5e461ffb6b1b8e8dd1e6f464221d5593efc52585\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 17:18:21 2017 +0800\n\n    优化录制回放界面展示\n\ncommit 880297356da46e2e2009b6b2e07bebed9bec71b3\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jul 11 12:32:43 2017 +0800\n\n    优化录制回放列表显示\n\ncommit d5f74a9269d4e08f03535d556b676d9467ec51f1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Jul 6 11:21:48 2017 +0800\n\n    优化回放列表展示\n\ncommit 03114bce0713af3256e0637b425a2ebab9d5378a\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 27 20:05:37 2017 +0800\n\n    恢复主播角色\n\ncommit e279c3699c96ea009dc3b197b8e6cf01367782f5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 27 19:03:44 2017 +0800\n\n    添加anchor角色\n\ncommit 08665da227c280b4e80798615e7f18833c2f50be\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Jun 13 09:47:10 2017 +0800\n\n    更新ILiveSDK版本1.5.0\n\ncommit f98e141bd4bc5de2a179ee7e1379a927283a089d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jun 2 16:41:42 2017 +0800\n\n    优化编译脚本\n\ncommit 69108228370553863b7c1077d13617d4b894539f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Jun 2 16:31:40 2017 +0800\n\n    设置中添加日志上报\n\ncommit 274d487eec4983aded3b2af1746ee688a91016da\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 18:11:25 2017 +0800\n\n    修正美颜标题\n\ncommit 961cb7b89572c6806a7a722939e4c385f0891b20\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:45:15 2017 +0800\n\n    修正日志标题\n\ncommit fa67c0d644bc0429ea87fa48d779552c8bc976cb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:42:33 2017 +0800\n\n    优化按钮\n\ncommit 4b1cc9961fa05bb9e55b0b99bdf2fe27ccc84792\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 17:39:48 2017 +0800\n\n    统一个人界面\n\ncommit 897e1bf7043cba4761a38b6e4e1e5bb984e529f9\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 15:28:51 2017 +0800\n\n    优化美颜配置界面\n\ncommit 08460bf9a25332c307af04b4fb8f31a9f2cf9fc1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 15:09:58 2017 +0800\n\n    添加观众模式配置\n\ncommit 4fe00a3513cb7360968e6d8aa3f945d06f4b94cc\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 10:27:48 2017 +0800\n\n    修复上麦观众无法关闭麦克风问题\n\ncommit c4021052c8a5a5abe78f933c4f937753a9df80ea\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed May 17 09:43:44 2017 +0800\n\n    添加创建房间角色配置\n\ncommit feb2a13e16914e3392879b32d052030722c64594\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 10:39:36 2017 +0800\n\n    优化随心播，添加异常保护\n\ncommit baef1c485fefd6ff78a5c4945587ccd3c5664778\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 09:47:41 2017 +0800\n\n    添加空指针保护\n\ncommit 47c956c2aa12559a1344d857f5e53f561c4d9689\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 25 09:42:12 2017 +0800\n\n    添加保护\n\ncommit f0d9061d08e94aef7572394bc18e7ebd44b7b558\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Apr 24 15:30:59 2017 +0800\n\n    优化录制界面展示\n\ncommit 46e1e60f851ace7bb7de6308203532a244f765bf\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 19:33:40 2017 +0800\n\n    大屏也全屏显示\n\ncommit 9ed84d7192c15e25d6bfc432b12d872188800c7e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 18:00:15 2017 +0800\n\n    默认全屏显示\n\ncommit 944ba215a7175d1ef2ca5072016ab58f97ee2dca\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 17:57:25 2017 +0800\n\n    修正跨房数量限制，屏蔽ILive美颜\n\ncommit be92403e3494a700804758363e77025fd7bec2f9\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 17:51:21 2017 +0800\n\n    优化界面显示\n\ncommit bf68f8fb89ab7fc33cef0c8dc66e905d354ded98\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 16:43:17 2017 +0800\n\n    添加日志上报格式限制\n\ncommit 4b1045dbbca0c66a19cd42c7af1e8cae03d23b5f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 15:54:25 2017 +0800\n\n    修正观众快速切换房间\n\ncommit 0124bc4524c748b8344068df2edc274d3e36ade5\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 14:37:43 2017 +0800\n\n    添加日志上报对话框\n\ncommit 74a5cd070666f258e0c1ca9bf7cc8fee1d79fc24\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:53:52 2017 +0800\n\n    退房间时取消跨房连麦\n\ncommit 939aed1590c43ae031702be4075f17533da9adfe\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:44:24 2017 +0800\n\n    添加进房间失败提示\n\ncommit 1aa82838d42d2af57b1136f14fd53ed70b2945d1\nAuthor: xkazer <xkazer@sina.com>\nDate:   Fri Apr 21 11:41:25 2017 +0800\n\n    优化消息信令逻辑\n\ncommit 420d39822f7d38546fbf22084e67791b0f0abdf4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:44:57 2017 +0800\n\n    进房间重置滤镜及美颜效果\n\ncommit 080177ab128b16808a76132ef586822362c1f15d\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:18:37 2017 +0800\n\n    修复回到上次直播提示不能取消问题\n\ncommit cdfd7c630f60d27ed31cb2b5d1b5b2cc2269810b\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 19:05:39 2017 +0800\n\n    修复Android 4.4以上对话框被状态栏挡住问题\n\ncommit 15282d68d98423654baf7ed98543fdcc265f8451\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 17:46:42 2017 +0800\n\n    添加ILive美颜实现\n\ncommit 6c9de955fe376c0236d8c6743330782f27357ea8\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 16:30:42 2017 +0800\n\n    锁定单选对话框风格\n    添加美颜类型配置\n\ncommit b5eb44742980cf03f31af953e1be98f867b79898\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:44:38 2017 +0800\n\n    修复日志上报失败出现异常\n\ncommit a1baa3ece785d7b4adf35a111efab008aa93115e\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:41:16 2017 +0800\n\n    优化直播上部菜单栏布局\n\ncommit 160e99d09c58d116f0f9d0392093a7bfe2bdc698\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 11:17:18 2017 +0800\n\n    更新直播选择界面为单选对话框\n\ncommit fff8450fa1fbfc9ae99b835ffc407422630d84cb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 09:43:52 2017 +0800\n\n    修正部分手机上布局问题\n\ncommit 7eebd4572bedcc86f3fd316fc8e8cf82e21614b7\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 20 09:21:17 2017 +0800\n\n    修正变声菜单与实际不匹配问题\n\ncommit a57816173971fd365c39961ecf9e6c73dfddbd74\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 20:20:23 2017 +0800\n\n    修改随心播直播间页面布局\n\ncommit 31be0d2b3f51dd710c58f48d254cdae4ac7f6923\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 16:30:50 2017 +0800\n\n    添加跨房连麦列表选择\n\ncommit ebcadc71eb851ff4ec181ad1a20ba9b16248adb4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 19 11:50:21 2017 +0800\n\n    修复异常\n\ncommit 7243593a07a19002ad7809a3259d4f5fa4e8efb6\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 18 17:57:25 2017 +0800\n\n    修复观众也有跨房连麦入口问题\n\ncommit 30b5d8d307426f9357aa43cf219d8fd2968086e2\nAuthor: xkazer <xkazer@sina.com>\nDate:   Tue Apr 18 09:11:46 2017 +0800\n\n    界面优化\n\ncommit b3b48b569d103e98c920989453ca3ae876888323\nAuthor: xkazer <xkazer@sina.com>\nDate:   Mon Apr 17 17:04:14 2017 +0800\n\n    添加滤镜/脸萌效果\n\ncommit e6c1d4e4f4b81536925f10f2ce8850b98a4a6912\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 13 20:13:42 2017 +0800\n\n    跨房连麦功能演示\n\ncommit c60816ad2ac8bb08f6e6c2153977ce226616308f\nAuthor: xkazer <xkazer@sina.com>\nDate:   Thu Apr 13 11:17:36 2017 +0800\n\n    更新ILiveSDK版本\n\ncommit 1228f00e01b8615fbe35c7a395ee9261ed2a2faa\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:22:40 2017 +0800\n\n    修正RDM构建的脚本\n\ncommit 42af344b8ecd2b6726c2859b5e8a8e558985bbcb\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:17:42 2017 +0800\n\n    添加RDM构建脚本\n\ncommit 954b3c39963117112881d61c2a814708998d95a4\nAuthor: xkazer <xkazer@sina.com>\nDate:   Wed Apr 12 20:11:29 2017 +0800\n\n    更新1.3.4.9(IMSDK 2.5.3)版本\n\n# Conflicts:\n#\tapp/build.gradle\n#\tbuild.gradle\n#\tgradle.properties","distinct":true,"url":"https://api.github.com/repos/zhaoyang21cn/iLiveSDK_Android_Suixinbo/commits/c84731005667c6c7924e6855823c4a9536b7b6ec"},{"sha":"a1474381e63453637f2187dfa2fff28a7543e2fa","author":{"name":"xkazerzhang","email":"a8fd0f049f080a6692fc6102812e27fb2c1d251a@tencent.com"},"message":"Merge branch 'master' of https://github.com/zhaoyang21cn/ILiveSDK_Android_Demos","distinct":true,"url":"https://api.github.com/repos/zhaoyang21cn/iLiveSDK_Android_Suixinbo/commits/a1474381e63453637f2187dfa2fff28a7543e2fa"}]}
{"actor":{"display_login":"xkazer"}}