feat: 修改自启动应用启动方式
*修改自启动应用启动方式, 采用loader进程先校验应用信息,再拉起应用的方式 *修复launcher模块部分接口导出失败的问题 *增加launcher、dock、loader模块代码注释 Log: 修改自启动应用启动方式 Task: https://pms.uniontech.com/task-view-131611.html Influence: 应用启动方式不同 Change-Id: Ie88027602d1395c6bbad69e610f3639ecc7dfbc1
This commit is contained in:
@ -22,13 +22,13 @@
|
||||
|
||||
bool LauncherItemInfo::operator!=(const LauncherItemInfo &itemInfo)
|
||||
{
|
||||
return itemInfo.ID != ID;
|
||||
return itemInfo.id != id;
|
||||
}
|
||||
|
||||
QDBusArgument &operator<<(QDBusArgument &argument, const LauncherItemInfo &itemInfo)
|
||||
{
|
||||
argument.beginStructure();
|
||||
argument << itemInfo.Path << itemInfo.Name << itemInfo.ID << itemInfo.Icon << itemInfo.CategoryID << itemInfo.TimeInstalled;
|
||||
argument << itemInfo.path << itemInfo.name << itemInfo.id << itemInfo.icon << itemInfo.categoryId << itemInfo.timeInstalled << itemInfo.keywords;
|
||||
argument.endStructure();
|
||||
return argument;
|
||||
}
|
||||
@ -36,7 +36,7 @@ QDBusArgument &operator<<(QDBusArgument &argument, const LauncherItemInfo &itemI
|
||||
const QDBusArgument &operator>>(const QDBusArgument &argument, LauncherItemInfo &itemInfo)
|
||||
{
|
||||
argument.beginStructure();
|
||||
argument >> itemInfo.Path >> itemInfo.Name >> itemInfo.ID >> itemInfo.Icon >> itemInfo.CategoryID >> itemInfo.TimeInstalled;
|
||||
argument >> itemInfo.path >> itemInfo.name >> itemInfo.id >> itemInfo.icon >> itemInfo.categoryId >> itemInfo.timeInstalled >> itemInfo.keywords;
|
||||
argument.endStructure();
|
||||
return argument;
|
||||
}
|
||||
|
@ -26,12 +26,13 @@
|
||||
#include <QDBusMetaType>
|
||||
|
||||
struct LauncherItemInfo {
|
||||
QString Path;
|
||||
QString Name;
|
||||
QString ID;
|
||||
QString Icon;
|
||||
qint64 CategoryID;
|
||||
qint64 TimeInstalled;
|
||||
QString path;
|
||||
QString name;
|
||||
QString id;
|
||||
QString icon;
|
||||
qint64 categoryId;
|
||||
qint64 timeInstalled;
|
||||
QStringList keywords;
|
||||
bool operator!=(const LauncherItemInfo &versionInfo);
|
||||
};
|
||||
|
||||
|
@ -14,7 +14,6 @@ public:
|
||||
friend const QDBusArgument &operator>>(const QDBusArgument &arg, Rect &rect);
|
||||
friend QDBusArgument &operator<<(QDBusArgument &arg, const Rect &rect);
|
||||
|
||||
private:
|
||||
qint32 X, Y, Width, Height;
|
||||
};
|
||||
|
||||
|
7
src/frameworkdbus/types/unlaunchedappmap.cpp
Normal file
7
src/frameworkdbus/types/unlaunchedappmap.cpp
Normal file
@ -0,0 +1,7 @@
|
||||
#include "unlaunchedappmap.h"
|
||||
|
||||
void registerUnLaunchedAppMapMetaType()
|
||||
{
|
||||
qRegisterMetaType<UnLaunchedAppMap>("UnLaunchedAppMap");
|
||||
qDBusRegisterMetaType<UnLaunchedAppMap>();
|
||||
}
|
14
src/frameworkdbus/types/unlaunchedappmap.h
Normal file
14
src/frameworkdbus/types/unlaunchedappmap.h
Normal file
@ -0,0 +1,14 @@
|
||||
#ifndef TYPES_H
|
||||
#define TYPES_H
|
||||
|
||||
#include <QMap>
|
||||
#include <QStringList>
|
||||
#include <QDBusMetaType>
|
||||
|
||||
typedef QMap<QString, QStringList> UnLaunchedAppMap;
|
||||
|
||||
Q_DECLARE_METATYPE(UnLaunchedAppMap)
|
||||
|
||||
void registerUnLaunchedAppMapMetaType();
|
||||
|
||||
#endif // TYPES_H
|
Reference in New Issue
Block a user