fix: Change the app order in Privacy and Security

Change the app order in Privacy and Security

Log: Change the app order in Privacy and Security
pms: BUG-303417

Author: pengfeixx

src/plugin-privacy/operation/applicationitem.cpp

@@ -100,7 +100,24 @@ void ApplicationItem::onNameChanged(const QString &name)
         return;
     m_name = name;
     // 不区分大小写，中文按拼音排序排后面
-    m_sortField = DTK_CORE_NAMESPACE::Chinese2Pinyin(m_name.toUpper());
+    QString upperName = m_name.toUpper();
+
+    int category = 2;
+    for (const QChar &ch : upperName) {
+        if (ch.isSpace())
+            continue;
+        if (ch.isDigit()) {
+            category = 0;
+        } else if (ch.isLetter() && ch.unicode() < 128) {
+            category = 1;
+        } else {
+            category = 2;
+        }
+        break;
+    }
+
+    QString pinyin = DTK_CORE_NAMESPACE::Chinese2Pinyin(upperName);
+    m_sortField = QString::number(category) + pinyin;
     emitDataChanged();
 }
 

src/plugin-privacy/operation/privacysecuritymodel.cpp

@@ -90,8 +90,16 @@ void AppsModel::reset(ApplicationItemListPtr appList)
 
 void AppsModel::appendItem(ApplicationItem *appItem)
 {
-    beginInsertRows(QModelIndex(), rowCount(), rowCount());
-    m_appItems.append(appItem);
+    int insertPos = m_appItems.size();
+    for (int i = 0; i < m_appItems.size(); ++i) {
+        if (appItem->sortField() < m_appItems.at(i)->sortField()) {
+            insertPos = i;
+            break;
+        }
+    }
+
+    beginInsertRows(QModelIndex(), insertPos, insertPos);
+    m_appItems.insert(insertPos, appItem);
     endInsertRows();
 }