Quellcode durchsuchen

上暂停控制和播放器修改

namejr vor 4 Jahren
Ursprung
Commit
703981f035

+ 26 - 10
EBook.Web/Common/tasklib_book.css

@@ -187,28 +187,44 @@ table tr td:last-child{
 }
 .ListenDiv[data-status='1']{
     height:80px;
-    background-color:rgba(10,169,251,1);
 }
-.ListenDiv .LDivTop{
-    width:calc(100% - 20px);
-    height:29px;
-    border-bottom:1px solid rgba(255,255,255,0.6);
-    margin:0 auto;
-    overflow:hidden;
+.ListenDiv .LDivTop {
+    width: calc(100% - 20px);
+    height: 29px;
+    border-bottom: 1px solid rgba(255,255,255,0.6);
+    margin: 0 auto;
+    overflow: hidden;
 }
 .LDivTop .LDivTItem{
     width:66px;
-    height:26px;
+    height:29px;
     float:left;
-    color:rgba(255,255,255,0.6);
+    color:rgba(10,169,251,0.6);
     font-size: 16px;
     text-align:center;
     line-height: 26px;
+    color: #44bfff;
+    margin-left:53px;
+}
+.LDivTItem:first-child{
+    margin-left:10px;
 }
 .LDivTItem[data-selected='1']{
-    color:rgba(255,255,255,1);
+    font-weight: bold;
+    font-stretch: normal;
+    letter-spacing: 0px;
+    color:rgba(10,169,251,1);
     border-bottom:2px solid #fff;
 }
+.SImg{
+    width: 18px;
+    height: 11px;
+    background-image: url('../Images/select2x.png');
+    background-repeat:no-repeat;
+    position:relative;
+    left:43px;
+    top:-55px
+}
 .ListenDiv .LDivFooter{
     width:calc(100%);
     height:47px;

+ 38 - 18
EBook.Web/Common/tasklib_book.js

@@ -69,6 +69,9 @@ var cTTypeFunc = function () {
 var pressTableFlag = false;
 var GetPadVal = function (THandel) {
     var PaddingVal = $(THandel).css("padding");
+    if (PaddingVal == null || PaddingVal == "") {
+        return 0;
+    }
     var PadValArr = PaddingVal.split(" ");
     if (PadValArr.length > 2) {
         return parseFloat(PadValArr[1]) + parseFloat(PadValArr[3]);
@@ -438,17 +441,21 @@ var AdjustTableFunc = function (sWidthVal) {
 var LimitPreFlag = false;  // 限制点击过宽
 var AddListenDiv = function (NodeHandle, NIndex, sWidthVal) {
     var UrlStr = $(NodeHandle).attr("alt");
-    sWidthVal = sWidthVal > $(document.body).width() ? sWidthVal : $(document.body).width()
+    sWidthVal = sWidthVal > $(document.body).width() ? sWidthVal : $(document.body).width();
     var ListenDivWidth = (sWidthVal - GetPadVal(document.body));
     ListenDivWidth = (ListenDivWidth > 414 ? 414 : ListenDivWidth);
     if (UrlStr != null && UrlStr.indexOf("|") > -1) {
         var UrlArr = UrlStr.split("|");
         var htmlStr = '<div class="ListenDiv" data-status="1" style="width:' + ListenDivWidth + 'px;"><div class="LDivTop">';
+        var selectIndex = 0;
         for (var i = 0; i < UrlArr.length; i++) {
             var SelectedN = (i == 0 ? 1 : 0);
+            if (SelectedN) {
+                selectIndex = i;
+            }
             htmlStr += '<div class="LDivTItem LDivTItem_' + NIndex + ' LDivTItem_' + NIndex + '_' + i + '" data-selected="' + SelectedN + '" onclick="cLSourceFunc(' + NIndex + ',' + i + ')" data-auduourl="' + UrlArr[i] + '">听力材料' + (i + 1) + '</div>';
         }
-        htmlStr += '</div><div class="LDivFooter"><div class="LDFPlayS LDFPlayS_' + NIndex + '" data-playstatus="0" onclick="playMusicFunc(' + NIndex + ')"></div><div class="LDFPauseS LDFPauseS_' + NIndex + '" onclick="pauseMusicFunc(' + NIndex + ')"></div><div class="LDFProcS"><div class="LDFPWhite LDFPWhite_' + NIndex + '"></div><div class="LDFProcImg LDFProcImg_' + NIndex + '"></div></div><div class="LDFTimerS" data-mtype="' + cTTypeFunc + '" data-fsFlag="100"><span class="RunTime RunTime_' + NIndex + '">00:00</span><span>/</span><span class="RunAllTime RunAllTime_' + NIndex + '">00:00</span></div></div></div>';
+        htmlStr += '</div><div class="LDivFooter"><div class="LDFPlayS LDFPlayS_' + NIndex + '" data-playstatus="0" onclick="playMusicFunc(' + NIndex + ')"></div><div class="LDFPauseS LDFPauseS_' + NIndex + '" onclick="pauseMusicFunc(' + NIndex + ')"></div><div class="LDFProcS"><div class="LDFPWhite LDFPWhite_' + NIndex + '"></div><div class="LDFProcImg LDFProcImg_' + NIndex + '"></div></div><div class="LDFTimerS" data-mtype="' + cTTypeFunc + '" data-fsFlag="100"><span class="RunTime RunTime_' + NIndex + '">00:00</span><span>/</span><span class="RunAllTime RunAllTime_' + NIndex + '">00:00</span></div></div><div class="SImg SImg_' + NIndex + '"></div></div>';
     }
     else if (UrlStr != null) {
         var htmlStr = '<div class="ListenDiv" data-status="0" style="width:' + ListenDivWidth + 'px;"><div class="LDivTop" style="width:1px;height:0px;overflow:hidden;"><div class="LDivTItem LDivTItem_' + NIndex + ' LDivTItem_' + NIndex + '_0" data-selected="1" onclick="cLSourceFunc(' + NIndex + ',0)" data-selected="1"  data-auduourl="' + UrlStr + '"></div></div><div class="LDivFooter"><div class="LDFPlayS LDFPlayS_' + NIndex + '" data-playstatus="0" onclick="playMusicFunc(' + NIndex + ')"></div><div class="LDFPauseS LDFPauseS_' + NIndex + '" onclick="pauseMusicFunc(' + NIndex + ')"></div><div class="LDFProcS"><div class="LDFPWhite LDFPWhite_' + NIndex + '"></div><div class="LDFProcImg LDFProcImg_' + NIndex + '"></div></div><div class="LDFTimerS" data-mtype="' + cTTypeFunc + '" data-fsFlag="100"><span class="RunTime RunTime_' + NIndex + '">00:00</span><span>/</span><span class="RunAllTime RunAllTime_' + NIndex + '">00:00</span></div></div></div>';
@@ -461,11 +468,14 @@ var AddListenDiv = function (NodeHandle, NIndex, sWidthVal) {
 }
 // 切换听力材料
 var cLSourceFunc = function (iIndex, oIndex) {
-    pauseMusicFunc(iIndex);
+    //pauseMusicFunc(iIndex);
     var jQIStr = ".LDivTItem_" + iIndex;
     var jQIOStr = ".LDivTItem_" + iIndex + '_' + oIndex;
     $(jQIStr).attr("data-selected", 0);
     $(jQIOStr).attr("data-selected", 1);
+    jQIStr = ".SImg_" + iIndex;
+    var LeftPx = 43 + oIndex * 119;
+    $(jQIStr).css("left", LeftPx + "px");
 }
 // 暂停播放处理
 var playMusicFunc = function (iIndex) {
@@ -506,7 +516,6 @@ var pauseMusicFunc = function (iIndex) {
     $(jQStr).attr("data-playstatus", 0);
     var jQStr = ".LDFPWhite_" + iIndex;
     var TTimeNum = parseInt($(jQStr).attr("data-alltime"));
-    playImageFunc(iIndex, 0, TTimeNum);
     var AudioUrl = $(jQStr).parent().prev(".LDivTop").find(".LDivTItem[data-selected='1']").attr("data-auduourl");
     var info = {
         Id: iIndex,  // 第几个
@@ -534,15 +543,26 @@ var playImageFunc = function (iIndex, leftVal, allTimes) {
         PWidthVal = PWidthVal.replace(PUint, "");
     }
     var LeftPx = (leftVal * parseFloat(PWidthVal)) / allTimes;
-    //LeftPx = LeftPx > 158 ? 158 : LeftPx;
-    //LeftPx = LeftPx < 0 ? 0 : LeftPx;
-    $(jQStr).css("left", (LeftPx - 15) + PUint);  // 设置滑块滚动
-    jQStr = ".LDFPWhite_" + iIndex;
-    $(jQStr).css("width", LeftPx + PUint).attr("data-ctime", leftVal).attr("data-alltime", allTimes);  // 白色背景
-    jQStr = ".RunTime_" + iIndex;
-    $(jQStr).text(timeToStrFunc((leftVal / 1000)));  // 设置文字显示
-    jQStr = ".RunAllTime_" + iIndex;
-    $(jQStr).text(timeToStrFunc((allTimes / 1000)));  // 设置文字显示
+    if (allTimes <= 0) {
+        $(jQStr).css("left", "-15px");  // 设置滑块滚动
+        jQStr = ".LDFPWhite_" + iIndex;
+        $(jQStr).css("width", "-15px").attr("data-ctime", "0").attr("data-alltime", "0");  // 白色背景
+        jQStr = ".RunTime_" + iIndex;
+        $(jQStr).text(timeToStrFunc((leftVal / 1000)));  // 设置文字显示
+        jQStr = ".RunAllTime_" + iIndex;
+        $(jQStr).text(timeToStrFunc((allTimes / 1000)));  // 设置文字显示
+    }
+    else {
+        //LeftPx = LeftPx > 158 ? 158 : LeftPx;
+        //LeftPx = LeftPx < 0 ? 0 : LeftPx;
+        $(jQStr).css("left", (LeftPx - 15) + PUint);  // 设置滑块滚动
+        jQStr = ".LDFPWhite_" + iIndex;
+        $(jQStr).css("width", LeftPx + PUint).attr("data-ctime", leftVal).attr("data-alltime", allTimes);  // 白色背景
+        jQStr = ".RunTime_" + iIndex;
+        $(jQStr).text(timeToStrFunc(0));  // 设置文字显示
+        jQStr = ".RunAllTime_" + iIndex;
+        $(jQStr).text(timeToStrFunc(0));  // 设置文字显示
+    }
 };
 // 时间转换
 var timeToStrFunc = function (timerNumber) {
@@ -1611,10 +1631,10 @@ function getAllAnswer() {
         }
         //mytext = mytext == "" ? "&nbsp;&nbsp;&nbsp;" : mytext;
         if (!isanswer) {
-            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" +PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text no-answer' style='display:inline-block;'>" +mytext + "</buttom></div>");
+            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
         }
         else {
-            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" +parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" +PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
+            $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' data-astatus='1' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
         }
         if (mytext == "未作答") {
             $(".answer-body[answer-id='" + answerid + "']").attr("data-errstatus", "1");
@@ -1834,7 +1854,7 @@ function backupAllAnswer(answerJson, statusType) {
                     $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text no-answer' style='display:inline-block;'>" + mytext + "</buttom></div>");
                 }
                 else {
-                    $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" +PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text' style='display:inline-block;'>" +mytext + "</buttom></div>");
+                    $(item).prop("outerHTML", "<div class='answer-body' answer-id='" + answerid + "' parent-anid='" + parentid + "' answer-anstext='" + answerText + "' answer-isky='2' answer-text='" + mytext + "' data-astatus='" + statusType + "' data-errstatus='0' onclick='ClickRecFunc(" + parentid + ")'><div class='answer-audio-range'><img class='nextpic' src='" + PicInfo.recordPlayImgUrl + "'/><span class='answer-audio-text'>作答音频</span></div><div class='answer-point-range' style='display:none;'><div class='answer-point-range-div'><img class='nextpic' src='" + PicInfo.answerPointImgUrl + "'/><span class='answer-point-text'>答题点</span></div></div><buttom class='answer-text' style='display:inline-block;'>" + mytext + "</buttom></div>");
                 }
                 if (mytext == "未作答") {
                     $(".answer-body[answer-id='" + answerid + "']").attr("data-errstatus", "1");
@@ -2328,7 +2348,7 @@ function adjustFontSize(FontSize) {
 function mobileTSFunc(ID) {
     pressTableFlag = true;
     // 移动端回调处理
-    plugin.onSeekBarDown(ID);  安卓
+    plugin.onSeekBarDown(ID); 安卓
 }
 // 音频进度条松开回调
 function mobileTEFunc(ID) {
@@ -2337,5 +2357,5 @@ function mobileTEFunc(ID) {
     var jQStr = ".LDFPlayS_" + ID;
     var AudioUrl = $(jQStr).parent().prev(".LDivTop").find(".LDivTItem[data-selected='1']").attr("data-auduourl");  // 路径
     // 移动端回调处理
-     plugin.onSeekBarUp(ID, CurrentTime, AudioUrl);  // 安卓
+    plugin.onSeekBarUp(ID, CurrentTime, AudioUrl);  // 安卓
 }

+ 2 - 0
EBook.Web/EBook.Web.csproj

@@ -128,6 +128,7 @@
     <Content Include="HightCode\data202116P.json" />
     <Content Include="HightCode\data202116S.json" />
     <Content Include="HightCode\data202116W.json" />
+    <Content Include="Images\select2x.png" />
     <Content Include="Lghp\012.lghp" />
     <Content Include="Lghp\011.lghp" />
     <None Include="Lghp\21773.lghp" />
@@ -153,6 +154,7 @@
     <Content Include="Lghp\err.lghp" />
     <Content Include="Lghp\22518.lghp" />
     <Content Include="Lghp\22788.lghp" />
+    <Content Include="Lghp\data20211251605.lghp" />
     <None Include="Lghp\gaicuo.lghp" />
     <None Include="Lghp\TS.lghp" />
     <Content Include="NK\tasklib_book.css" />

BIN
EBook.Web/Images/select2x.png