From cf12f398516b01f1f1038a3914225f6b50e567c4 Mon Sep 17 00:00:00 2001
From: sunfengsheng <327123947@qq.com>
Date: Mon, 18 Jan 2021 15:03:36 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E8=BE=93=E5=85=A5=E4=B8=BA/=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE=E9=80=89=E9=A1=B9=E4=BC=9A=E5=85=A8=E9=83=A8=E5=87=BA?=
 =?UTF-8?q?=E6=9D=A5=20link:http://172.17.66.192/biz/bug-view-34525.html?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 libsearch/appsearch/app-match.cpp         | 14 +++++++++-----
 libsearch/settingsearch/setting-match.cpp | 10 ++++++----
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/libsearch/appsearch/app-match.cpp b/libsearch/appsearch/app-match.cpp
index f4ee40d..ee82996 100644
--- a/libsearch/appsearch/app-match.cpp
+++ b/libsearch/appsearch/app-match.cpp
@@ -16,6 +16,7 @@ QStringList AppMatch::startMatchApp(QString input){
     this->getAppName();
     m_returnResult=m_midResult;
     m_midResult.clear();
+//    qWarning()<<"m_returnResult  :"<<m_returnResult;
     return m_returnResult;
 }
 
@@ -192,6 +193,7 @@ void AppMatch::getAppName()
         g_key_file_load_from_file(keyfile,filepath,flags,nullptr);
         name=g_key_file_get_locale_string(keyfile,"Desktop Entry","Name", nullptr, nullptr);
         namestr=QString::fromLocal8Bit(name);
+//        qWarning()<<"namestr :"<<namestr;
         appNameMatch(namestr,str);
     }
 
@@ -212,13 +214,15 @@ void AppMatch::appNameMatch(QString appname,QString desktoppath){
         m_midResult.append(desktoppath);
         return;
     }
-    QString pinyin=FileUtils::findMultiToneWords(appname).at(0);// 中文转拼音
-    if(pinyin.contains(m_sourceText,Qt::CaseInsensitive)){
-        m_midResult.append(desktoppath);
-        return;
-    }
     QString shouzimu=FileUtils::findMultiToneWords(appname).at(1);// 中文转首字母
     if(shouzimu.contains(m_sourceText,Qt::CaseInsensitive)){
         m_midResult.append(desktoppath);
+        return;
+    }
+    if(m_sourceText.size()<2)
+        return;
+    QString pinyin=FileUtils::findMultiToneWords(appname).at(0);// 中文转拼音
+    if(pinyin.contains(m_sourceText,Qt::CaseInsensitive)){
+        m_midResult.append(desktoppath);
     }
 }
diff --git a/libsearch/settingsearch/setting-match.cpp b/libsearch/settingsearch/setting-match.cpp
index 2327d86..fc3ba2e 100644
--- a/libsearch/settingsearch/setting-match.cpp
+++ b/libsearch/settingsearch/setting-match.cpp
@@ -89,6 +89,8 @@ QStringList SettingsMatch::matching(){
 //        qDebug()<<key;
         for(int t=0; t<regmatch.size();t++)
         {
+            if(m_sourceText=="/")
+                continue;
             QString str =regmatch.at(t);
             if(str.contains(m_sourceText))
             {
@@ -96,14 +98,14 @@ QStringList SettingsMatch::matching(){
                 returnresult.append(str);//中文名
                 continue;
             }
-             QString pinyin=FileUtils::findMultiToneWords(str).at(0);// 中文转拼音
-             if(pinyin.contains(m_sourceText,Qt::CaseInsensitive)){
+             QString shouzimu=FileUtils::findMultiToneWords(str).at(1);// 中文转首字母
+             if(shouzimu.contains(m_sourceText,Qt::CaseInsensitive)){
                  str=key+"/"+str;
                  returnresult.append(str);
                  continue;
              }
-             QString shouzimu=FileUtils::findMultiToneWords(str).at(1);// 中文转首字母
-             if(shouzimu.contains(m_sourceText,Qt::CaseInsensitive)){
+             QString pinyin=FileUtils::findMultiToneWords(str).at(0);// 中文转拼音
+             if(pinyin.contains(m_sourceText,Qt::CaseInsensitive)){
                  str=key+"/"+str;
                  returnresult.append(str);
              }