Merge branch 'master' into 'release'

Master

See merge request !1

Public/static/js/common.js

@@ -92,9 +92,9 @@ var readingJson = {};
 let play = 'music';
 let musicStatus = true;
 
-$('.video1').append('<video controls poster="/Public/static/image2/video1.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="/Public/static/media/video1.mp4" id="video1"></video>');
-$('.video2').append('<video controls poster="/Public/static/image2/video2.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="/Public/static/media/video2.mp4" id="video2"></video>');
-$('.video3').append('<video controls poster="/Public/static/image2/video3.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="/Public/static/media/video3.mp4" id="video3"></video>');
+$('.video1').append('<video controls poster="/Public/static/image2/video1.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="http://media.izhida.cn/pingan-video1.mp4" id="video1"></video>');
+$('.video2').append('<video controls poster="/Public/static/image2/video2.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="http://media.izhida.cn/pingan-video2.mp4" id="video2"></video>');
+$('.video3').append('<video controls poster="/Public/static/image2/video3.jpg" webkit-playsinline="webkit-playsinline" playsinline="playsinline" x5-playsinline="x5-playsinline" x-webkit-airplay="allow" src="http://media.izhida.cn/pingan-video3.mp4" id="video3"></video>');
 const video1 = document.getElementById("video1");
 const video2 = document.getElementById("video2");
 const video3 = document.getElementById("video3");
@@ -108,38 +108,10 @@ preloadimages(preloadImageList, function () {}, function (progress) {});
 $(document).ready(function () {
 
     document.addEventListener('touchstart', function () {}, false);
-
-    // var EventUtil = {
-    //     addHandler: function (element, type, handler) {
-    //         if (element.addEventListener) {
-    //             element.addEventListener(type, handler, false);
-    //         } else if (element.attachEvent) {
-    //             element.attachEvent("on" + type, handler);
-    //         } else {
-    //             element["on" + type] = handler;
-    //         }
-    //     }
-    // };
-    // (function () {
-    //     EventUtil.addHandler(window, "pageshow", function (event) {
-    //         try {
-    //             $('#music')[0].play();
-    //         } catch (error) {
-    //             alert(error)
-    //         }
-    //     });
-    // })();
     for (let i = 0; i < 21; i++) {
         $('.read' + i).show().addClass('read');
         $('.link' + i).hide();
     }
-    // reading = getCookie('reading');
-    // if (reading != null) {
-    //     readingJson = JSON.parse(reading);
-    //     for (let key in readingJson) {
-    //         $('.read' + key.replace(/link/, "")).show();
-    //     }
-    // }
 
 
     $('.music').click(function () {
@@ -205,10 +177,6 @@ $(document).ready(function () {
         video2.pause();
     });
 
-    // $('.btn-clear').on('click', function () {
-    //     setCookie('reading', '{}');
-    // });
-
     $('.read0').on('click', {
         link: linkAddress.link0,
         index: 0
@@ -294,74 +262,6 @@ $(document).ready(function () {
         link: linkAddress.link20,
         index: 20
     }, jumpTolink);
-
-
-
-
-    // $('.link0').on('touchstart', {
-    //     index: 0
-    // }, showRead);
-
-    // $('.link1').on('touchstart', {
-    //     index: 1
-    // }, showRead);
-    // $('.link2').on('touchstart', {
-    //     index: 2
-    // }, showRead);
-    // $('.link3').on('touchstart', {
-    //     index: 3
-    // }, showRead);
-    // $('.link4').on('touchstart', {
-    //     index: 4
-    // }, showRead);
-    // $('.link5').on('touchstart', {
-    //     index: 5
-    // }, showRead);
-    // $('.link6').on('touchstart', {
-    //     index: 6
-    // }, showRead);
-    // $('.link7').on('touchstart', {
-    //     index: 7
-    // }, showRead);
-    // $('.link8').on('touchstart', {
-    //     index: 8
-    // }, showRead);
-    // $('.link9').on('touchstart', {
-    //     index: 9
-    // }, showRead);
-    // $('.link10').on('touchstart', {
-    //     index: 10
-    // }, showRead);
-    // $('.link11').on('touchstart', {
-    //     index: 11
-    // }, showRead);
-    // $('.link12').on('touchstart', {
-    //     index: 12
-    // }, showRead);
-    // $('.link13').on('touchstart', {
-    //     index: 13
-    // }, showRead);
-    // $('.link14').on('touchstart', {
-    //     index: 14
-    // }, showRead);
-    // $('.link15').on('touchstart', {
-    //     index: 15
-    // }, showRead);
-    // $('.link16').on('touchstart', {
-    //     index: 16
-    // }, showRead);
-    // $('.link17').on('touchstart', {
-    //     index: 17
-    // }, showRead);
-    // $('.link18').on('touchstart', {
-    //     index: 18
-    // }, showRead);
-    // $('.link19').on('touchstart', {
-    //     index: 19
-    // }, showRead);
-    // $('.link20').on('touchstart', {
-    //     index: 20
-    // }, showRead);
 });
 
 function jumpTolink(event) {