|
@@ -27,7 +27,7 @@ using TEAMModelOS.SDK.Module.AzureTable.Interfaces;
|
|
|
using BlipFill = DocumentFormat.OpenXml.Presentation.BlipFill;
|
|
|
using ColorMap = DocumentFormat.OpenXml.Presentation.ColorMap;
|
|
|
using Paragraph = HiTeachCC.Model.PowerPoint.Paragraph;
|
|
|
-using Picture = HiTeachCC.Model.PowerPoint.Picture;
|
|
|
+using Picture = HiTeachCC.Model.PowerPoint.Media;
|
|
|
using Point = HiTeachCC.Model.PowerPoint.Point;
|
|
|
using Shape = HiTeachCC.Model.PowerPoint.Shape;
|
|
|
using Text = HiTeachCC.Model.PowerPoint.Text;
|
|
@@ -359,7 +359,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
|
|
|
if (element is DocumentFormat.OpenXml.Presentation.Picture pic)//p:pic 图片
|
|
|
{
|
|
|
- Model.PowerPoint.Picture picture = ProcessPicNode(pic, idPartPairs, slideMaster, colorMaps, index, slideLayoutTables, slideMasterTables, SlideMasterTextStyles, theme);
|
|
|
+ Model.PowerPoint.Media picture = ProcessPicNode(pic, idPartPairs, slideMaster, colorMaps, index, slideLayoutTables, slideMasterTables, SlideMasterTextStyles, theme);
|
|
|
if (!string.IsNullOrEmpty(picture.Image)) {
|
|
|
string[] strs = picture.Image.Split(',');
|
|
|
string fileExt = StringHelper.SubMidString(strs[0], ":", ";");
|
|
@@ -388,7 +388,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
else if (element is DocumentFormat.OpenXml.AlternateContent mc)//mc:alternatecontent 公式等
|
|
|
{
|
|
|
|
|
|
- Model.PowerPoint.Picture picture = ProcessMcNode(mc, idPartPairs, slideMaster, colorMaps, index, slideLayoutTables, slideMasterTables, SlideMasterTextStyles, theme);
|
|
|
+ Model.PowerPoint.Media picture = ProcessMcNode(mc, idPartPairs, slideMaster, colorMaps, index, slideLayoutTables, slideMasterTables, SlideMasterTextStyles, theme);
|
|
|
if (!string.IsNullOrEmpty(picture.Image))
|
|
|
{
|
|
|
string[] strs = picture.Image.Split(',');
|
|
@@ -946,7 +946,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
/// <param name="slideLayoutTables"></param>
|
|
|
/// <param name="slideMasterTables"></param>
|
|
|
/// <returns></returns>
|
|
|
- public Model.PowerPoint.Picture ProcessPicNode(DocumentFormat.OpenXml.Presentation.Picture element,
|
|
|
+ public Model.PowerPoint.Media ProcessPicNode(DocumentFormat.OpenXml.Presentation.Picture element,
|
|
|
IEnumerable<IdPartPair> idPartPairs, SlideMaster slideMaster, Dictionary<string, string> colors, int index,
|
|
|
Style slideLayoutTables,
|
|
|
Style slideMasterTables, XmlDocument slideMasterTextStyles, Theme theme)
|
|
@@ -971,7 +971,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
|
|
|
Border border = PowerPointHelper.GetBorder(element.OuterXml, false, colors);
|
|
|
Model.PowerPoint.Fill fill = PowerPointHelper.GetShapeFill(element.OuterXml, colors);
|
|
|
- Model.PowerPoint.Picture picture = new Model.PowerPoint.Picture
|
|
|
+ Model.PowerPoint.Media picture = new Model.PowerPoint.Media
|
|
|
{
|
|
|
Type = "Pic",
|
|
|
Position = picPosition,
|
|
@@ -995,7 +995,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
/// <param name="slideLayoutTables"></param>
|
|
|
/// <param name="slideMasterTables"></param>
|
|
|
/// <returns></returns>
|
|
|
- public Model.PowerPoint.Picture ProcessMcNode(DocumentFormat.OpenXml.AlternateContent element, IEnumerable<IdPartPair> slidePart,
|
|
|
+ public Model.PowerPoint.Media ProcessMcNode(DocumentFormat.OpenXml.AlternateContent element, IEnumerable<IdPartPair> slidePart,
|
|
|
SlideMaster slideMaster, Dictionary<string, string> colors,
|
|
|
int index,
|
|
|
Style slideLayoutTables,
|
|
@@ -1022,7 +1022,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
}
|
|
|
|
|
|
|
|
|
- public Model.PowerPoint.Picture MathConvertImage(AlternateContent content, Theme theme, Dictionary<string, string> colors, IEnumerable<IdPartPair> slidePart, int index)
|
|
|
+ public Model.PowerPoint.Media MathConvertImage(AlternateContent content, Theme theme, Dictionary<string, string> colors, IEnumerable<IdPartPair> slidePart, int index)
|
|
|
{
|
|
|
var fallbacks = from contentChoice in content.Descendants<AlternateContentFallback>() select contentChoice;
|
|
|
if (fallbacks.Count() > 0)
|
|
@@ -1053,7 +1053,7 @@ namespace HiTeachCC.Service.PowerPoint.Implement
|
|
|
Border border = PowerPointHelper.GetBorder(shape.OuterXml, false, colors);
|
|
|
Model.PowerPoint.Fill fill = PowerPointHelper.GetShapeFill(shape.OuterXml, colors);
|
|
|
// picPosition.Index = index;
|
|
|
- Model.PowerPoint.Picture picture = new Model.PowerPoint.Picture
|
|
|
+ Model.PowerPoint.Media picture = new Model.PowerPoint.Media
|
|
|
{
|
|
|
Type = "Math",
|
|
|
Position = picPosition,
|