@@ -101,7 +101,7 @@ | ||
101 | 101 | Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0) |
102 | 102 | |
103 | 103 | |
104 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Chapter) | |
104 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep2) | |
105 | 105 | |
106 | 106 | eachChartLine = eachChartLine.Replace(eachImg, sNewImg) |
107 | 107 |
@@ -287,10 +287,10 @@ | ||
287 | 287 | For Each uImg As String In listImg |
288 | 288 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
289 | 289 | If uImg.IndexOf("alone") > -1 Then |
290 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
290 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2) | |
291 | 291 | sChapter = sChapter.Replace(uImg, sImgKey) |
292 | 292 | Else |
293 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
293 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2) | |
294 | 294 | sChapter = sChapter.Replace(uImg, sImgKey) |
295 | 295 | End If |
296 | 296 | Next |
@@ -420,7 +420,7 @@ | ||
420 | 420 | For Each eachImg As String In listImg |
421 | 421 | |
422 | 422 | Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0) |
423 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Chapter) | |
423 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep2) | |
424 | 424 | |
425 | 425 | mChapter.listText(ctrLine) = mChapter.listText(ctrLine).Replace(eachImg, sNewImg) |
426 | 426 |
@@ -441,7 +441,7 @@ | ||
441 | 441 | For Each eachImg As String In listImg |
442 | 442 | |
443 | 443 | Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0) |
444 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume) | |
444 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1) | |
445 | 445 | |
446 | 446 | mVolume.listText(ctrLine) = mVolume.listText(ctrLine).Replace(eachImg, sNewImg) |
447 | 447 |
@@ -461,7 +461,7 @@ | ||
461 | 461 | For Each eachImg As String In listImg |
462 | 462 | |
463 | 463 | Dim sScr As String = cTools.listNav_SE(eachImg, "src=""", """/>", False)(0) |
464 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Section) | |
464 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1) | |
465 | 465 | |
466 | 466 | mSeciont.listText(ctrLine) = mSeciont.listText(ctrLine).Replace(eachImg, sNewImg) |
467 | 467 |
@@ -723,10 +723,10 @@ | ||
723 | 723 | For Each uImg As String In listImg |
724 | 724 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
725 | 725 | If uImg.IndexOf("calibre2") > -1 Then |
726 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
726 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1) | |
727 | 727 | sChapter = sChapter.Replace(uImg, sImgKey) |
728 | 728 | Else |
729 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
729 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1) | |
730 | 730 | sChapter = sChapter.Replace(uImg, sImgKey) |
731 | 731 | End If |
732 | 732 | Next |
@@ -777,10 +777,10 @@ | ||
777 | 777 | For Each uImg As String In listImg |
778 | 778 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
779 | 779 | If uImg.IndexOf("alone") > -1 Then |
780 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
780 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1) | |
781 | 781 | sChapter = sChapter.Replace(uImg, sImgKey) |
782 | 782 | Else |
783 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
783 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1) | |
784 | 784 | sChapter = sChapter.Replace(uImg, sImgKey) |
785 | 785 | End If |
786 | 786 | Next |
@@ -1436,10 +1436,10 @@ | ||
1436 | 1436 | For Each uImg As String In listImg |
1437 | 1437 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
1438 | 1438 | If uImg.IndexOf("calibre22") > -1 Then |
1439 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
1439 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep1) | |
1440 | 1440 | sHtml = sHtml.Replace(uImg, sImgKey) |
1441 | 1441 | Else |
1442 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
1442 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep1) | |
1443 | 1443 | sHtml = sHtml.Replace(uImg, sImgKey) |
1444 | 1444 | End If |
1445 | 1445 | Next |
@@ -1572,10 +1572,10 @@ | ||
1572 | 1572 | For Each uImg As String In listImg |
1573 | 1573 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
1574 | 1574 | If uImg.IndexOf("calibre14") > -1 Then |
1575 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1575 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2) | |
1576 | 1576 | sHtml = sHtml.Replace(uImg, sImgKey) |
1577 | 1577 | Else |
1578 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1578 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2) | |
1579 | 1579 | sHtml = sHtml.Replace(uImg, sImgKey) |
1580 | 1580 | End If |
1581 | 1581 | Next |
@@ -1827,10 +1827,10 @@ | ||
1827 | 1827 | For Each uImg As String In listImg |
1828 | 1828 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
1829 | 1829 | If uImg.IndexOf("imz") > -1 Then |
1830 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1830 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2) | |
1831 | 1831 | sHtml = sHtml.Replace(uImg, sImgKey) |
1832 | 1832 | Else |
1833 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1833 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2) | |
1834 | 1834 | sHtml = sHtml.Replace(uImg, sImgKey) |
1835 | 1835 | End If |
1836 | 1836 | Next |
@@ -1981,10 +1981,10 @@ | ||
1981 | 1981 | For Each uImg As String In listImg |
1982 | 1982 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
1983 | 1983 | If uImg.IndexOf("imz") > -1 Then |
1984 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1984 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2) | |
1985 | 1985 | sHtml = sHtml.Replace(uImg, sImgKey) |
1986 | 1986 | Else |
1987 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
1987 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2) | |
1988 | 1988 | sHtml = sHtml.Replace(uImg, sImgKey) |
1989 | 1989 | End If |
1990 | 1990 | Next |
@@ -2136,10 +2136,10 @@ | ||
2136 | 2136 | For Each uImg As String In listImg |
2137 | 2137 | Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) |
2138 | 2138 | If uImg.IndexOf("imz") > -1 Then |
2139 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
2139 | + Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emDep.Dep2) | |
2140 | 2140 | sHtml = sHtml.Replace(uImg, sImgKey) |
2141 | 2141 | Else |
2142 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Chapter) | |
2142 | + Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emDep.Dep2) | |
2143 | 2143 | sHtml = sHtml.Replace(uImg, sImgKey) |
2144 | 2144 | End If |
2145 | 2145 | Next |
@@ -88,10 +88,10 @@ | ||
88 | 88 | Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True) |
89 | 89 | For Each eachImg As String In listImg |
90 | 90 | Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0) |
91 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume) | |
91 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1) | |
92 | 92 | |
93 | 93 | If eachImg.IndexOf("calibre20") > -1 Then |
94 | - sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume) | |
94 | + sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1) | |
95 | 95 | End If |
96 | 96 | |
97 | 97 | sChapter = sChapter.Replace(eachImg, sNewImg) |
@@ -89,10 +89,10 @@ | ||
89 | 89 | Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True) |
90 | 90 | For Each eachImg As String In listImg |
91 | 91 | Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0) |
92 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume) | |
92 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1) | |
93 | 93 | |
94 | 94 | If eachImg.IndexOf("calibre20") > -1 Then |
95 | - sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume) | |
95 | + sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1) | |
96 | 96 | End If |
97 | 97 | |
98 | 98 | sChapter = sChapter.Replace(eachImg, sNewImg) |
@@ -89,10 +89,10 @@ | ||
89 | 89 | Dim listImg As List(Of String) = cTools.listNav_SE(sChapter, "<img", "/>", True) |
90 | 90 | For Each eachImg As String In listImg |
91 | 91 | Dim sScr As String = eachImg.Split("/").ToList()(2).Split("""").ToList()(0) |
92 | - Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emUrlImgDep.Volume) | |
92 | + Dim sNewImg As String = cTools.sGaiji(sScr, emEpub6.emDep.Dep1) | |
93 | 93 | |
94 | 94 | If eachImg.IndexOf("calibre20") > -1 Then |
95 | - sNewImg = cTools.sMapImg(sScr, emEpub6.emUrlImgDep.Volume) | |
95 | + sNewImg = cTools.sMapImg(sScr, emEpub6.emDep.Dep1) | |
96 | 96 | End If |
97 | 97 | |
98 | 98 | sChapter = sChapter.Replace(eachImg, sNewImg) |
@@ -4,7 +4,7 @@ | ||
4 | 4 | Public Class cDep3_006 |
5 | 5 | |
6 | 6 | Dim bookPath As String |
7 | - Dim emCurreDep As emEpub6.emUrlImgDep | |
7 | + Dim emCurreDep As emEpub6.emDep | |
8 | 8 | |
9 | 9 | Public mEpub As New List(Of modelSection) |
10 | 10 |
@@ -31,7 +31,7 @@ | ||
31 | 31 | |
32 | 32 | For iCtrSection As Integer = 0 To model.navMap.Count - 1 |
33 | 33 | |
34 | - emCurreDep = emEpub6.emUrlImgDep.Section | |
34 | + emCurreDep = emEpub6.emDep.Dep1 | |
35 | 35 | |
36 | 36 | Dim ncxSection As ncxNavPoint = model.navMap(iCtrSection) |
37 | 37 | Dim mSection As New modelSection() |
@@ -56,7 +56,7 @@ | ||
56 | 56 | |
57 | 57 | For ctrVolume As Integer = 0 To ncxSection.navPoint.Count - 1 |
58 | 58 | |
59 | - emCurreDep = emEpub6.emUrlImgDep.Chapter | |
59 | + emCurreDep = emEpub6.emDep.Dep2 | |
60 | 60 | Dim ncxVolume As ncxNavPointNavPoint = ncxSection.navPoint(ctrVolume) |
61 | 61 | |
62 | 62 |
@@ -81,7 +81,7 @@ | ||
81 | 81 | |
82 | 82 | For ctrChapter As Integer = 0 To ncxVolume.navPoint.Count - 1 |
83 | 83 | |
84 | - emCurreDep = emEpub6.emUrlImgDep.Chapter | |
84 | + emCurreDep = emEpub6.emDep.Dep2 | |
85 | 85 | Dim ncxChapter As ncxNavPointNavPointNavPoint = ncxVolume.navPoint(ctrChapter) |
86 | 86 | |
87 | 87 | Dim mChapter As New modelChapter |
@@ -1103,15 +1103,15 @@ | ||
1103 | 1103 | |
1104 | 1104 | Dim sScr As String = "Img/" & sText |
1105 | 1105 | |
1106 | - If kbnDEP = emEpub6.emUrlImgDep.Section Then | |
1106 | + If kbnDEP = emEpub6.emDep.Dep0 Then | |
1107 | 1107 | sScr = "" & sScr |
1108 | 1108 | End If |
1109 | 1109 | |
1110 | - If kbnDEP = emEpub6.emUrlImgDep.Volume Then | |
1110 | + If kbnDEP = emEpub6.emDep.Dep1 Then | |
1111 | 1111 | sScr = "../" & sScr |
1112 | 1112 | End If |
1113 | 1113 | |
1114 | - If kbnDEP = emEpub6.emUrlImgDep.Chapter Then | |
1114 | + If kbnDEP = emEpub6.emDep.Dep2 Then | |
1115 | 1115 | sScr = "../../" & sScr |
1116 | 1116 | End If |
1117 | 1117 |
@@ -1146,15 +1146,15 @@ | ||
1146 | 1146 | |
1147 | 1147 | Dim sScr As String = "Img/" & sImgName |
1148 | 1148 | |
1149 | - If kbnDEP = emEpub6.emUrlImgDep.Section Then | |
1149 | + If kbnDEP = emEpub6.emDep.Dep0 Then | |
1150 | 1150 | sScr = "" & sScr |
1151 | 1151 | End If |
1152 | 1152 | |
1153 | - If kbnDEP = emEpub6.emUrlImgDep.Volume Then | |
1153 | + If kbnDEP = emEpub6.emDep.Dep1 Then | |
1154 | 1154 | sScr = "../" & sScr |
1155 | 1155 | End If |
1156 | 1156 | |
1157 | - If kbnDEP = emEpub6.emUrlImgDep.Chapter Then | |
1157 | + If kbnDEP = emEpub6.emDep.Dep2 Then | |
1158 | 1158 | sScr = "../../" & sScr |
1159 | 1159 | End If |
1160 | 1160 |
@@ -1406,13 +1406,6 @@ | ||
1406 | 1406 | Dep3 |
1407 | 1407 | End Enum |
1408 | 1408 | |
1409 | - Enum emUrlImgDep As Integer | |
1410 | - Section | |
1411 | - Volume | |
1412 | - Chapter | |
1413 | - End Enum | |
1414 | - | |
1415 | - | |
1416 | 1409 | Public Const spText_EmDash As String = "spText_EmDash" |
1417 | 1410 | |
1418 | 1411 | Public Const spText_SubTitle As String = "spText_SubTitle" |
@@ -289,16 +289,16 @@ | ||
289 | 289 | |
290 | 290 | Dim listImg As List(Of String) = cTools.listNav_SE(sHtml, "<img", "/>", True) |
291 | 291 | |
292 | - For Each uImg As String In listImg | |
293 | - Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) | |
294 | - If uImg.IndexOf("kindle-cn-bodycontent-image-alone1") > -1 Then | |
295 | - Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
296 | - sHtml = sHtml.Replace(uImg, sImgKey) | |
297 | - Else | |
298 | - Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
299 | - sHtml = sHtml.Replace(uImg, sImgKey) | |
300 | - End If | |
301 | - Next | |
292 | + 'For Each uImg As String In listImg | |
293 | + ' Dim sImgUrl As String = cTools.listNav_SE(uImg, "src=""", """/>", False)(0) | |
294 | + ' If uImg.IndexOf("kindle-cn-bodycontent-image-alone1") > -1 Then | |
295 | + ' Dim sImgKey As String = cTools.sMapImg(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
296 | + ' sHtml = sHtml.Replace(uImg, sImgKey) | |
297 | + ' Else | |
298 | + ' Dim sImgKey As String = cTools.sGaiji(sImgUrl, emEpub6.emUrlImgDep.Volume) | |
299 | + ' sHtml = sHtml.Replace(uImg, sImgKey) | |
300 | + ' End If | |
301 | + 'Next | |
302 | 302 | |
303 | 303 | |
304 | 304 |
@@ -1338,20 +1338,20 @@ | ||
1338 | 1338 | sGetUriFile = listURL(listURL.Count - 1) |
1339 | 1339 | End Function |
1340 | 1340 | |
1341 | - Public Shared Function sGaiji(ByVal sScr As String, ByVal iDep As emEpub6.emUrlImgDep) As String | |
1341 | + Public Shared Function sGaiji(ByVal sScr As String, ByVal iDep As emEpub6.emDep) As String | |
1342 | 1342 | |
1343 | 1343 | Dim listTemp As List(Of String) = sScr.Split("/").ToList() |
1344 | 1344 | sScr = "Img/" & listTemp(listTemp.Count - 1) |
1345 | 1345 | |
1346 | - If iDep = emEpub6.emUrlImgDep.Section Then | |
1346 | + If iDep = emEpub6.emDep.Dep0 Then | |
1347 | 1347 | sScr = "../../../" & sScr |
1348 | 1348 | End If |
1349 | 1349 | |
1350 | - If iDep = emEpub6.emUrlImgDep.Volume Then | |
1350 | + If iDep = emEpub6.emDep.Dep1 Then | |
1351 | 1351 | sScr = "../../" & sScr |
1352 | 1352 | End If |
1353 | 1353 | |
1354 | - If iDep = emEpub6.emUrlImgDep.Chapter Then | |
1354 | + If iDep = emEpub6.emDep.Dep2 Then | |
1355 | 1355 | sScr = "../" & sScr |
1356 | 1356 | End If |
1357 | 1357 |
@@ -1361,20 +1361,20 @@ | ||
1361 | 1361 | End Function |
1362 | 1362 | |
1363 | 1363 | |
1364 | - Public Shared Function sMapImg(ByVal sScr As String, ByVal iDep As emEpub6.emUrlImgDep) As String | |
1364 | + Public Shared Function sMapImg(ByVal sScr As String, ByVal iDep As emEpub6.emDep) As String | |
1365 | 1365 | |
1366 | 1366 | Dim listTemp As List(Of String) = sScr.Split("/").ToList() |
1367 | 1367 | sScr = "Img/" & listTemp(listTemp.Count - 1) |
1368 | 1368 | |
1369 | - If iDep = emEpub6.emUrlImgDep.Section Then | |
1369 | + If iDep = emEpub6.emDep.Dep0 Then | |
1370 | 1370 | sScr = "../" & sScr |
1371 | 1371 | End If |
1372 | 1372 | |
1373 | - If iDep = emEpub6.emUrlImgDep.Volume Then | |
1373 | + If iDep = emEpub6.emDep.Dep1 Then | |
1374 | 1374 | sScr = "../../" & sScr |
1375 | 1375 | End If |
1376 | 1376 | |
1377 | - If iDep = emEpub6.emUrlImgDep.Chapter Then | |
1377 | + If iDep = emEpub6.emDep.Dep2 Then | |
1378 | 1378 | sScr = "../../../" & sScr |
1379 | 1379 | End If |
1380 | 1380 |