!14 Solve the problem that biometric devices cannot read

From: @tanyulong2021
Reviewed-by: @dou33
Signed-off-by: @dou33
This commit is contained in:
openeuler-ci-bot 2021-12-02 01:25:25 +00:00 committed by Gitee
commit 566286c5b9
2 changed files with 39 additions and 1 deletions

View File

@ -0,0 +1,33 @@
From e3878c5a0fd9f0f9aa8ab9c36298f998791e7fef Mon Sep 17 00:00:00 2001
From: tanyulong <tanyulong@kylinos.cn>
Date: Fri, 29 Oct 2021 10:43:36 +0800
Subject: [PATCH] Solve the problem that biometric devices cannot read
---
ukui-greeter/BiometricAuth/biometricdeviceinfo.cpp | 10 ++++++++++
1 file changed, 10 insertions(+)
diff --git a/ukui-greeter/BiometricAuth/biometricdeviceinfo.cpp b/ukui-greeter/BiometricAuth/biometricdeviceinfo.cpp
index 23196d1..48dd8f2 100755
--- a/ukui-greeter/BiometricAuth/biometricdeviceinfo.cpp
+++ b/ukui-greeter/BiometricAuth/biometricdeviceinfo.cpp
@@ -113,6 +113,16 @@ QString GetDefaultDevice(const QString &userName)
// qDebug() << "configure path: " << settings.fileName();
QString defaultDevice = settings.value("DefaultDevice").toString();
+
+
+ if(defaultDevice.isEmpty())
+ {
+ QString configPath = QString("/var/lib/lightdm-data/%1/" UKUI_BIOMETRIC_CONFIG_PATH).arg(userName);
+ QSettings settings(configPath, QSettings::IniFormat);
+ defaultDevice = settings.value("DefaultDevice").toString();
+ }
+
+
if(defaultDevice.isEmpty())
{
QSettings sysSettings(UKUI_BIOMETRIC_SYS_CONFIG_PATH, QSettings::IniFormat);
--
2.30.0

View File

@ -1,7 +1,7 @@
%define debug_package %{nil} %define debug_package %{nil}
Name: ukui-greeter Name: ukui-greeter
Version: 3.0.1 Version: 3.0.1
Release: 5 Release: 6
Summary: Lightdm greeter for UKUI Summary: Lightdm greeter for UKUI
License: GPL-2.0 License: GPL-2.0
URL: http://www.ukui.org URL: http://www.ukui.org
@ -24,6 +24,7 @@ patch0: 0001-fix-icon-misplaced.patch
patch1: 0002-fix-ukui-greeter-desktop-option-issue.patch patch1: 0002-fix-ukui-greeter-desktop-option-issue.patch
patch2: 0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch patch2: 0001-Avoid-problem-of-writing-Chinese-garbled-characters.patch
patch3: 0003-add-set-dpi.patch patch3: 0003-add-set-dpi.patch
patch4: 0004-Solve-the-problem-that-biometric-devices-cannot-read.patch
%description %description
A greeter for UKUI desktop environment written by Qt5. A greeter for UKUI desktop environment written by Qt5.
@ -35,6 +36,7 @@ A greeter for UKUI desktop environment written by Qt5.
%patch1 -p1 %patch1 -p1
%patch2 -p1 %patch2 -p1
%patch3 -p1 %patch3 -p1
%patch4 -p1
%build %build
qmake-qt5 qmake-qt5
@ -59,6 +61,9 @@ gzip -c ukui-greeter/man/ukui-greeter.8 > %{buildroot}/usr/share/man/man8/ukui-
%{_datadir}/xgreeters/ukui-greeter.desktop %{_datadir}/xgreeters/ukui-greeter.desktop
%changelog %changelog
* Fri Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-6
- Solve the problem that biometric devices cannot read
* Fri Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-5 * Fri Oct 29 2021 tanyulong <tanyulong@kylinos.cn> - 3.0.1-5
- add set dpi - add set dpi