fix: [slide-show] The Next button should clicked double.

-- The Next button should clicked double.
-- The last animation not stop and logic return.

Log: fix issue
Bug: https://pms.uniontech.com/bug-view-328371.html

v20 BUG 分支合一到v25主线
Task: https://pms.uniontech.com/task-view-383475.html

Author: GongHeng2017

libimageviewer/slideshow/imageanimation.cpp

@@ -119,6 +119,7 @@ class LibImageAnimationPrivate : public QWidget
     void startSingleNextAnimation();
     void startSinglePreAnimation();
     void startStatic();
+    void forceStopCurrentAnimation();
     void endSlide()
     {
         if (m_staticTimer) {
@@ -542,6 +543,7 @@ void LibImageAnimationPrivate::startAnimation()
 
 void LibImageAnimationPrivate::startSingleNextAnimation()
 {
+<<<<<<< HEAD
     qDebug() << "Starting single next animation";
     if (m_isAnimationIng) {
         qDebug() << "Animation already in progress, stopping";
@@ -551,10 +553,18 @@ void LibImageAnimationPrivate::startSingleNextAnimation()
         setImage2(queue->jumpTonext());
         startAnimation();
     }
+=======
+    if (m_isAnimationIng)
+        forceStopCurrentAnimation();
+    setImage1(m_imageName2);
+    setImage2(queue->jumpTonext());
+    startAnimation();
+>>>>>>> 3ba0572 (fix: [slide-show] The Next button should clicked double.)
 }
 
 void LibImageAnimationPrivate::startSinglePreAnimation()
 {
+<<<<<<< HEAD
     qDebug() << "Starting single previous animation";
     if (m_isAnimationIng) {
         qDebug() << "Animation already in progress, stopping";
@@ -564,6 +574,13 @@ void LibImageAnimationPrivate::startSinglePreAnimation()
         setImage2(queue->jumpTopre());
         startAnimation();
     }
+=======
+    if (m_isAnimationIng)
+        forceStopCurrentAnimation();
+    setImage1(m_imageName2);
+    setImage2(queue->jumpTopre());
+    startAnimation();
+>>>>>>> 3ba0572 (fix: [slide-show] The Next button should clicked double.)
 }
 
 void LibImageAnimationPrivate::startStatic()
@@ -578,6 +595,20 @@ void LibImageAnimationPrivate::startStatic()
     m_staticTimer->start(SLIDER_TIME);
 }
 
+void LibImageAnimationPrivate::forceStopCurrentAnimation()
+{
+    if (m_continuousanimationTimer) {
+        m_continuousanimationTimer->stop();
+        m_continuousanimationTimer->setInterval(0);
+        m_factor = 0.0f;
+        m_isAnimationIng = false;
+    }
+    if (m_staticTimer) {
+        m_staticTimer->stop();
+        m_staticTimer->setInterval(0);
+    }
+}
+
 void LibImageAnimationPrivate::onContinuousAnimationTimer()
 {
     Q_Q(LibImageAnimation);

libimageviewer/unionimage/unionimage.cpp

@@ -24,7 +24,7 @@
 
 #include "unionimage/imageutils.h"
 extern "C" {
-#include "3rdparty/tiff-tools/converttiff.h"
+#include "../../3rdparty/tiff-tools/converttiff.h"
 }
 
 #include <cstring>