重新上传

videowidget/videowidget.cpp

@@ -81,7 +81,7 @@ void VideoWidget::initFlowPanel()
     //用布局顶住,左侧弹簧
     QHBoxLayout *layout = new QHBoxLayout;
     layout->setSpacing(2);
-    layout->setMargin(0);
+    layout->setContentsMargins(0, 0, 0, 0);
     layout->addStretch();
     flowPanel->setLayout(layout);
 
@@ -100,7 +100,7 @@ void VideoWidget::initFlowPanel()
     icons << QApplication::style()->standardIcon(QStyle::SP_DialogCancelButton);
 #else
     QList<QChar> chars;
-    chars << 0xe68d << 0xe672 << 0xe674 << 0xea36 << 0xe74c;
+    chars << QChar(0xe68d) << QChar(0xe672) << QChar(0xe674) << QChar(0xea36) << QChar(0xe74c);
 
     //判断图形字体是否存在,不存在则加入
     QFont iconFont;
@@ -277,7 +277,7 @@ void VideoWidget::drawBg(QPainter *painter)
     //背景图片为空则绘制文字,否则绘制背景图片
     if (bgImage.isNull()) {
         painter->setFont(this->font());
-        painter->setPen(palette().foreground().color());
+        painter->setPen(palette().windowText().color());
         painter->drawText(rect(), Qt::AlignCenter, bgText);
     } else {
         //居中绘制
@@ -583,26 +583,6 @@ void VideoWidget::btnClicked()
     emit btnClicked(btn->objectName());
 }
 
-void VideoWidget::setVideoWidth(int videoWidth)
-{
-
-}
-
-void VideoWidget::setVideoHeight(int videoHeight)
-{
-
-}
-
-void VideoWidget::setBufferWidth(int bufferWidth)
-{
-
-}
-
-void VideoWidget::setBufferHeight(int bufferHeight)
-{
-
-}
-
 uint VideoWidget::getLength()
 {
     return 0;
@@ -848,6 +828,26 @@ void VideoWidget::setOSD2Position(const VideoWidget::OSDPosition &osdPosition)
     this->osd2Position = osdPosition;
 }
 
+void VideoWidget::setOSD1Format(quint8 osdFormat)
+{
+    setOSD1Format((VideoWidget::OSDFormat)osdFormat);
+}
+
+void VideoWidget::setOSD2Format(quint8 osdFormat)
+{
+    setOSD2Format((VideoWidget::OSDFormat)osdFormat);
+}
+
+void VideoWidget::setOSD1Position(quint8 osdPosition)
+{
+    setOSD1Position((VideoWidget::OSDPosition)osdPosition);
+}
+
+void VideoWidget::setOSD2Position(quint8 osdPosition)
+{
+    setOSD2Position((VideoWidget::OSDPosition)osdPosition);
+}
+
 void VideoWidget::setFaceBorder(int faceBorder)
 {
     this->faceBorder = faceBorder;

videowidget/videowidget.h

@@ -23,13 +23,7 @@
 class QTimer;
 
 #ifdef quc
-#if (QT_VERSION < QT_VERSION_CHECK(5,7,0))
-#include <QtDesigner/QDesignerExportWidget>
-#else
-#include <QtUiPlugin/QDesignerExportWidget>
-#endif
-
-class QDESIGNER_WIDGET_EXPORT VideoWidget : public QWidget
+class Q_DECL_EXPORT VideoWidget : public QWidget
 #else
 class VideoWidget : public QWidget
 #endif
@@ -223,6 +217,11 @@ signals:
     //播放结束
     void receivePlayFinsh();
 
+    //总时长
+    void fileLengthReceive(qint64 length);
+    //当前播放时长
+    void filePositionReceive(qint64 position);
+
     //收到图片信号
     void receiveImage(const QImage &image);
 
@@ -233,16 +232,6 @@ signals:
     void btnClicked(const QString &objName);
 
 public slots:
-    //设置视频宽度
-    void setVideoWidth(int videoWidth);
-    //设置视频高度
-    void setVideoHeight(int videoHeight);
-
-    //设置缓存图片宽度
-    void setBufferWidth(int bufferWidth);
-    //设置缓存图片高度
-    void setBufferHeight(int bufferHeight);
-
     //获取长度
     uint getLength();
     //获取当前播放位置
@@ -348,6 +337,12 @@ public slots:
     //设置标签2位置
     void setOSD2Position(const OSDPosition &osdPosition);
 
+    //设置值自动进行枚举转换
+    void setOSD1Format(quint8 osdFormat);
+    void setOSD2Format(quint8 osdFormat);
+    void setOSD1Position(quint8 osdPosition);
+    void setOSD2Position(quint8 osdPosition);
+
     //设置人脸框粗细
     void setFaceBorder(int faceBorder);
     //设置人脸框颜色