!29 修复阅读协议中dbus设置不生效的问题

!29 修复阅读协议中dbus设置不生效的问题

debian/changelog

@@ -1,3 +1,9 @@
+kylin-os-installer (0.2.1-0k24) yangtze; urgency=medium
+
+  * openKylin 1.0版本许可协议dbus不生效修改，改为加上将修改后的dbus文件拷贝到新文件系统中 
+
+ -- yangdonghai <yangdonghai@kylinos.cn>  Tue, 12 Sep 2023 14:28:55 +0800
+
 kylin-os-installer (0.2.1-0k23) yangtze; urgency=medium
 
   * openKylin 1.0版本，更新changelog

debian/patches/0023-29-dbus.patch

@@ -0,0 +1,92 @@
+From: liushanwen <liushanwen@kylinos.cn>
+Date: Tue, 12 Sep 2023 07:31:11 +0000
+Subject: =?utf-8?b?ITI5IOS/ruWkjemYheivu+WNj+iuruS4rWRidXPorr7nva7kuI3nlJ8=?=
+ =?utf-8?b?5pWI55qE6Zeu6aKYICEyOSDkv67lpI3pmIXor7vljY/orq7kuK1kYnVz6K6+572u?=
+ =?utf-8?b?5LiN55Sf5pWI55qE6Zeu6aKY?=
+
+---
+ scripts/prepare/16copy-basic-filesystem |  1 +
+ src/plugins/KyLicense/licenseframe.cpp  | 32 ++++++++++++++++++++++++++------
+ src/plugins/KyLicense/licenseframe.h    |  1 +
+ 3 files changed, 28 insertions(+), 6 deletions(-)
+
+diff --git a/scripts/prepare/16copy-basic-filesystem b/scripts/prepare/16copy-basic-filesystem
+index 41ed355..aff39dd 100755
+--- a/scripts/prepare/16copy-basic-filesystem
++++ b/scripts/prepare/16copy-basic-filesystem
+@@ -82,6 +82,7 @@ deal_squashfs
+ rsync -aHAX /rofs/ /target
+ msg "文件系统拷贝完成"
+ sync
++cp /var/cache/kylin-daq/kylinDaqConf.json /target/var/cache/kylin-daq/
+ 
+ # 加密
+ if [[ "${isluks_lvm}" == "true" ]]; then
+diff --git a/src/plugins/KyLicense/licenseframe.cpp b/src/plugins/KyLicense/licenseframe.cpp
+index af44de5..da1de24 100644
+--- a/src/plugins/KyLicense/licenseframe.cpp
++++ b/src/plugins/KyLicense/licenseframe.cpp
+@@ -73,7 +73,12 @@ void LicenseFrame::initUI()
+     m_sendData = new QCheckBox;
+ //    licneseLayout->addWidget(m_sendData, 5, 1, 1, 1, Qt::AlignCenter);
+     m_sendData->setCheckable(true);
+-    m_sendData->setChecked(true);
++    int nUploadState = 0;
++    getUploadState(nUploadState);
++    if(1 == nUploadState)
++        m_sendData->setChecked(true);
++    else
++        m_sendData->setChecked(false);
+     vLayout->addWidget(m_sendData, 0, Qt::AlignLeft);
+     m_timetip = new QCheckBox;
+ //    licneseLayout->addWidget(m_timetip, 6, 1, 1, 1, Qt::AlignCenter);
+@@ -229,17 +234,32 @@ void LicenseFrame::setUploadState(bool isSet)//写dbus总线: 1收集；0不收
+     QDBusMessage messageCallStats = QDBusMessage::createMethodCall("com.kylin.daq", "/com/kylin/daq",
+                                                            "com.kylin.daq.interface","SetUploadState");
+     if (isSet)
+-        messageCallStats << 1;
++        nStatus = 1;
+     else
+-        messageCallStats << 0;
++        nStatus = 0;
++
++    messageCallStats << nStatus;
+     QDBusMessage messageResponseStats = QDBusConnection::systemBus().call(messageCallStats);
+     if (messageResponseStats.type() == QDBusMessage::ReplyMessage) {
+-//        strDate = messageResponseStats.arguments().takeFirst().toInt();
+-//        qDebug() << "strDate："<< strDate;
+-        qDebug() << "Set dbus SetUploadState successfully";
++        qDebug() << "Set dbus SetUploadState["<< nStatus <<"] successfully";
+     } else {
+         qDebug() << "Set dbus SetUploadState error：" << QDBusConnection::systemBus().lastError().message();
+     }
+ }
+ 
++bool LicenseFrame::getUploadState(int& status)
++{
++    QDBusMessage messageCallStats = QDBusMessage::createMethodCall("com.kylin.daq", "/com/kylin/daq",
++                                                           "com.kylin.daq.interface","GetUploadState");
++    QDBusMessage messageResponseStats = QDBusConnection::systemBus().call(messageCallStats);
++    if (messageResponseStats.type() == QDBusMessage::ReplyMessage) {
++        status = messageResponseStats.arguments().takeFirst().toInt();
++        qDebug() << "Get dbus GetUploadState successfully:"<<status;
++        return true;
++    } else {
++        qDebug() << "Get dbus GetUploadState error：" << QDBusConnection::systemBus().lastError().message();
++        return false;
++    }
++}
++
+ }
+diff --git a/src/plugins/KyLicense/licenseframe.h b/src/plugins/KyLicense/licenseframe.h
+index 9791665..1b05f42 100644
+--- a/src/plugins/KyLicense/licenseframe.h
++++ b/src/plugins/KyLicense/licenseframe.h
+@@ -29,6 +29,7 @@ public:
+     void translateStr();
+     QString readSettingIni();
+     void setBoardTabOrder();
++    bool getUploadState(int& status);
+ 
+ signals:
+ public slots:

debian/patches/series

@@ -20,3 +20,4 @@
 0020-25.patch
 0021-26.patch
 0022-28-dbug.patch
+0023-29-dbus.patch