Add ios11_test page
Brightcells
променени са 7 файла, в които са добавени 83 реда и са изтрити 4 реда
+ 4
- 0
course/settings.py
@@ -251,6 +251,10 @@ EMAIL_SUBJECT_PREFIX = u'[Course] ' |
||
| 251 | 251 |
# Admin Settings |
| 252 | 252 |
DISABLE_ACTION = False |
| 253 | 253 |
|
| 254 |
+# iOS11 Video Test |
|
| 255 |
+TENCENT_VIDEO_URL = '' |
|
| 256 |
+COURSE_VIDEO_URL = '' |
|
| 257 |
+ |
|
| 254 | 258 |
try: |
| 255 | 259 |
from local_settings import * |
| 256 | 260 |
except ImportError: |
+ 7
- 0
page/info_views.py
@@ -45,3 +45,10 @@ def course_info(request): |
||
| 45 | 45 |
'videos': videos, |
| 46 | 46 |
'params': 'user_id={}&vtoken={}'.format(user_id, request.GET.get('vtoken', '')),
|
| 47 | 47 |
}) |
| 48 |
+ |
|
| 49 |
+ |
|
| 50 |
+def ios11_test(request): |
|
| 51 |
+ return render(request, 'page/ios11_test.html', {
|
|
| 52 |
+ 'tencent_video_url': settings.TENCENT_VIDEO_URL, |
|
| 53 |
+ 'course_video_url': settings.COURSE_VIDEO_URL, |
|
| 54 |
+ }) |
+ 0
- 1
page/templates/page/course_info.html
@@ -94,7 +94,6 @@ |
||
| 94 | 94 |
</div> |
| 95 | 95 |
|
| 96 | 96 |
<script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
| 97 |
- <script src="//cdn.bootcss.com/video.js/6.2.8/video.min.js"></script> |
|
| 98 | 97 |
<script> |
| 99 | 98 |
$(function() {
|
| 100 | 99 |
var video_count = {{ video_count }};
|
+ 68
- 0
page/templates/page/ios11_test.html
@@ -0,0 +1,68 @@ |
||
| 1 |
+{% load staticfiles %}
|
|
| 2 |
+ |
|
| 3 |
+<!DOCTYPE html> |
|
| 4 |
+<html lang="zh-CN"> |
|
| 5 |
+ <head> |
|
| 6 |
+ <meta charset="utf-8"> |
|
| 7 |
+ <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"> |
|
| 8 |
+ <meta name="format-detection" content="telephone=no,email=no,address=no"> |
|
| 9 |
+ <meta name="viewport" content="width=device-width,initial-scale=1.0,user-scalable=no"> |
|
| 10 |
+ <title>iOS 11 视频测试</title> |
|
| 11 |
+ |
|
| 12 |
+ <link href="//res.wx.qq.com/open/libs/weui/0.4.3/weui.min.css" rel="stylesheet" type="text/css" /> |
|
| 13 |
+ <link href="{% static 'page/css/weui.ext.css' %}?v=1" rel="stylesheet" type="text/css" />
|
|
| 14 |
+ |
|
| 15 |
+ <style> |
|
| 16 |
+ .container {
|
|
| 17 |
+ position: absolute; |
|
| 18 |
+ top: 0; |
|
| 19 |
+ right: 0; |
|
| 20 |
+ bottom: 0; |
|
| 21 |
+ left: 0; |
|
| 22 |
+ background: #efefef; |
|
| 23 |
+ } |
|
| 24 |
+ .video_wrapper, .video_select {
|
|
| 25 |
+ width: 100%; |
|
| 26 |
+ background: #fff; |
|
| 27 |
+ margin-bottom: 10px; |
|
| 28 |
+ box-sizing: border-box; |
|
| 29 |
+ } |
|
| 30 |
+ </style> |
|
| 31 |
+ </head> |
|
| 32 |
+ <body> |
|
| 33 |
+ <div class="container" > |
|
| 34 |
+{# 腾讯视频链接自动播放#}
|
|
| 35 |
+ <div class="video_wrapper"> |
|
| 36 |
+ <video id="video1" width="100%" height="100%" autoplay controls x-webkit-airplay="true" webkit-playsinline="" playsinline="true" preload="none" poster="" src="{{ tencent_video_url }}"></video>
|
|
| 37 |
+ </div> |
|
| 38 |
+{# 兰海视频链接自动播放#}
|
|
| 39 |
+ <div class="video_wrapper"> |
|
| 40 |
+ <video id="video2" width="100%" height="100%" autoplay controls x-webkit-airplay="true" webkit-playsinline="" playsinline="true" preload="none" poster="" src="{{ course_video_url }}"></video>
|
|
| 41 |
+ </div> |
|
| 42 |
+{# 腾讯视频链接非自动播放#}
|
|
| 43 |
+ <div class="video_wrapper"> |
|
| 44 |
+ <video id="video3" width="100%" height="100%" controls x-webkit-airplay="true" webkit-playsinline="" playsinline="true" preload="none" poster="" src="{{ tencent_video_url }}"></video>
|
|
| 45 |
+ </div> |
|
| 46 |
+{# 兰海视频链接非自动播放#}
|
|
| 47 |
+ <div class="video_wrapper"> |
|
| 48 |
+ <video id="video4" width="100%" height="100%" controls x-webkit-airplay="true" webkit-playsinline="" playsinline="true" preload="none" poster="" src="{{ course_video_url }}"></video>
|
|
| 49 |
+ </div> |
|
| 50 |
+ </div> |
|
| 51 |
+ |
|
| 52 |
+ <script src="//cdn.bootcss.com/zepto/1.1.6/zepto.min.js"></script> |
|
| 53 |
+ <script> |
|
| 54 |
+ |
|
| 55 |
+ </script> |
|
| 56 |
+ <script type="text/javascript" src="//res.wx.qq.com/open/js/jweixin-1.2.0.js"></script> |
|
| 57 |
+ <script type="text/javascript" src="{% static 'course/js/jswe-0.0.1.js' %}"></script>
|
|
| 58 |
+ <script> |
|
| 59 |
+ V.initWxData({
|
|
| 60 |
+ imgUrl: 'http://pai.ai/static/pai2/img/paiai_96_96.png', |
|
| 61 |
+ link: 'http://course.xfoto.com.cn/we/weshare', |
|
| 62 |
+ desc: '兰海说成长', |
|
| 63 |
+ title: '兰海说成长', |
|
| 64 |
+ timeLine: '' |
|
| 65 |
+ }, true); |
|
| 66 |
+ </script> |
|
| 67 |
+ </body> |
|
| 68 |
+</html> |
+ 2
- 0
page/urls.py
@@ -9,4 +9,6 @@ urlpatterns = [ |
||
| 9 | 9 |
url(r'^course/code$', code_views.course_code, name='course_code'), |
| 10 | 10 |
url(r'^course/list$', list_views.course_list, name='course_list'), |
| 11 | 11 |
url(r'^course/info$', info_views.course_info, name='course_info'), |
| 12 |
+ |
|
| 13 |
+ url(r'^ios11/test$', info_views.ios11_test, name='ios11_test'), |
|
| 12 | 14 |
] |
+ 1
- 1
pep8.sh
@@ -6,4 +6,4 @@ |
||
| 6 | 6 |
# -- E128 continuation line under-indented for visual indent |
| 7 | 7 |
# -- E501 line too long |
| 8 | 8 |
|
| 9 |
-pep8 --exclude=migrations --ignore=E128,E501 . |
|
| 9 |
+pycodestyle --exclude=migrations --ignore=E128,E501 . |
+ 1
- 2
requirements.txt
@@ -6,7 +6,7 @@ Pillow==4.3.0 |
||
| 6 | 6 |
StatusCode==1.0.0 |
| 7 | 7 |
TimeConvert==1.4.1 |
| 8 | 8 |
cryptography==2.0.3 |
| 9 |
-django-admin==1.0.10 |
|
| 9 |
+django-admin==1.0.13 |
|
| 10 | 10 |
django-curtail-uuid==1.0.0 |
| 11 | 11 |
django-detect==1.0.5 |
| 12 | 12 |
django-file-md5==1.0.1 |
@@ -27,7 +27,6 @@ hiredis==0.2.0 |
||
| 27 | 27 |
isoweek==1.3.3 |
| 28 | 28 |
jsonfield==2.0.2 |
| 29 | 29 |
mock==2.0.0 |
| 30 |
-pep8==1.7.0 |
|
| 31 | 30 |
pysnippets==1.0.4 |
| 32 | 31 |
pywe-miniapp==1.0.0 |
| 33 | 32 |
pywe-oauth==1.0.5 |