feat: Merge permission/watermark into master

.tx/config

@@ -0,0 +1,10 @@
+[main]
+host = https://www.transifex.com
+minimum_perc = 80
+mode = developer
+
+[o:linuxdeepin:p:libimage-viewer:r:libimage-viewer]
+file_filter = src/libimageviewer/translations/libimageviewer_<lang>.ts
+source_file = src/libimageviewer/translations/libimageviewer.ts
+source_lang = en
+type = QT

.tx/deepin.conf

@@ -1 +1,2 @@
 [transifex]
+branch = m20

CMakeLists.txt

@@ -23,7 +23,7 @@ message(STATUS ${CMAKE_CXX_FLAGS})
 
 option(DOTEST "option for test" OFF)
 
-if(DOTEST)
+if(DOTEST OR CMAKE_BUILD_TYPE STREQUAL "Debug")
     add_subdirectory(tests)
 endif()
 

libimageviewer/imageengine.cpp

@@ -15,6 +15,7 @@
 #include "service/commonservice.h"
 #include "unionimage/imgoperate.h"
 #include "unionimage/unionimage.h"
+#include "service/permissionconfig.h"
 #include "service/imagedataservice.h"
 class ImageEnginePrivate
 {
@@ -32,9 +33,11 @@
 ImageEnginePrivate::ImageEnginePrivate(ImageEngine *parent): q_ptr(parent)
 {
     Q_Q(ImageEngine);
+    // 关联授权操作通知信号
+    QObject::connect(PermissionConfig::instance(), &PermissionConfig::authoriseNotify, q, &ImageEngine::sigAuthoriseNotify);
 
     QThread *workerThread = new QThread(q_ptr);
     m_worker = new LibImgOperate(workerThread);
     m_worker->moveToThread(workerThread);
     //一张缩略图制作完成，发送到主线程
     q->connect(m_worker, &LibImgOperate::sigOneImgReady, LibCommonService::instance(), &LibCommonService::slotSetImgInfoByPath);

libimageviewer/imageengine.h

@@ -30,7 +30,6 @@ class IMAGEVIEWERSHARED_EXPORT ImageEngine : public QObject
     //是否是可选转的图片
     bool isRotatable(const QString &path);
 
-
     //根据文件路径制作md5
     QString makeMD5(const QString &path);
 
@@ -53,27 +52,29 @@ class IMAGEVIEWERSHARED_EXPORT ImageEngine : public QObject
     void sigGetAlbumName(const QString &path);
     //添加到已有相册/新建相册
     void sigAddToAlbum(bool isNew, const QString &album, const QString &path);
-    void sigAddToAlbumWithUID(bool isNew, int UID, const QString &path); //采用UID方案的添加至相册
+    void sigAddToAlbumWithUID(bool isNew, int UID, const QString &path);  //采用UID方案的添加至相册
     //收藏/取消收藏
     void sigAddOrRemoveToFav(const QString &path, bool isAdd);
     //导出
     void sigExport(const QString &path);
     //从自定义相册中移除
     void sigRemoveFromCustom(const QString &path, const QString &album);
-    void sigRemoveFromCustomWithUID(const QString &path, int UID); //采用UID方案的从相册中删除
+    void sigRemoveFromCustomWithUID(const QString &path, int UID);  //采用UID方案的从相册中删除
     //退出幻灯片
     void exitSlideShow();
     //按下ESC键
     void escShortcutActivated(bool isSwitchFullScreen);
     //通知旋转
     void sigRotatePic(const QString &path);
 
-private:
+    // 授权操作通知信号
+    void sigAuthoriseNotify(const QJsonObject &data);
 
+private:
     static ImageEngine *m_ImageEngine;
 
     QScopedPointer<ImageEnginePrivate> d_ptr;
     Q_DECLARE_PRIVATE_D(qGetPtrHelper(d_ptr), ImageEngine)
 };
 
-#endif // IMAGEENGINE_H
+#endif  // IMAGEENGINE_H

libimageviewer/imageviewer.cpp

@@ -13,14 +13,20 @@
 #include <QDirIterator>
 #include <QTranslator>
 #include <DFileDialog>
+#include <dtkwidget_config.h>
 
 #include "imageengine.h"
 #include "viewpanel/viewpanel.h"
+#include "service/permissionconfig.h"
 #include "service/commonservice.h"
 #include "service/mtpfileproxy.h"
 #include "unionimage/imageutils.h"
 #include "unionimage/baseutils.h"
 
+#ifdef DTKWIDGET_CLASS_DWaterMarkHelper
+#include <DWaterMarkHelper>
+#endif
+
 #define PLUGINTRANSPATH "/usr/share/libimageviewer/translations"
 class ImageViewerPrivate
 {
@@ -33,11 +39,17 @@
     Q_DECLARE_PUBLIC(ImageViewer)
 };
 
 ImageViewerPrivate::ImageViewerPrivate(imageViewerSpace::ImgViewerType imgViewerType, QString savePath, AbstractTopToolbar *customTopToolbar, ImageViewer *parent)
     : q_ptr(parent)
 {
-    QDir dir(PLUGINTRANSPATH);
+    // 在界面前初始化授权配置
+    if (!qApp) {
+        qWarning() << qPrintable("Must init authorise config after QApplication initialized!");
+    } else {
+        PermissionConfig::instance()->initFromArguments(qApp->arguments());
+    }
 
+    QDir dir(PLUGINTRANSPATH);
     if (dir.exists()) {
         QDirIterator qmIt(PLUGINTRANSPATH, QStringList() << QString("*%1.qm").arg(QLocale::system().name()), QDir::Files);
 
@@ -64,7 +76,7 @@
             }
         }
     }
-//    }
+
     Q_Q(ImageViewer);
     m_imgViewerType = imgViewerType;
     //记录当前展示模式
@@ -75,11 +87,32 @@
     QVBoxLayout *layout = new QVBoxLayout(q);
     layout->setContentsMargins(0, 0, 0, 0);
     q->setLayout(layout);
     m_panel = new LibViewPanel(customTopToolbar, q);
     layout->addWidget(m_panel);
+
+#ifdef DTKWIDGET_CLASS_DWaterMarkHelper
+    // 设置看图水印，目前仅在主要展示区域显示
+    if (PermissionConfig::instance()->hasReadWaterMark()) {
+        auto data = PermissionConfig::instance()->readWaterMarkData();
+        DWaterMarkHelper::instance()->setData(data);
+        DWaterMarkHelper::instance()->registerWidget(m_panel);
+
+        // 仅权限控制图片单独展示
+        QObject::connect(PermissionConfig::instance(), &PermissionConfig::currentImagePathChanged, q_ptr, [ this ](const QString &, bool isTargetImage){
+            if (!PermissionConfig::instance()->isValid()) {
+                return;
+            }
+
+            DWaterMarkWidget *mark = m_panel->findChild<DWaterMarkWidget *>();
+            if (mark) {
+                mark->setVisible(isTargetImage);
+            }
+        });
+    }
+#endif
 }
 
 ImageViewer::ImageViewer(imageViewerSpace::ImgViewerType imgViewerType, QString savePath, AbstractTopToolbar *customTopToolbar, QWidget *parent)
     : DWidget(parent)
     , d_ptr(new ImageViewerPrivate(imgViewerType, savePath, customTopToolbar, this))
 {