shenmo7192
/
spark-store
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

!251 修复ARM64的渲染问题 

* fixup! update debian/changelog.
* fix: ARM64设备渲染
This commit is contained in:
Pluto 2023-12-09 14:22:11 +00:00
parent 406e4d5400
commit 0bc0d13036
7 changed files with 125 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main.cpp
View File

@ -160,7 +160,6 @@ int main(int argc, char *argv[])
*/
env += " --disable-gpu";
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
QSurfaceFormat format;
format.setRenderableType(QSurfaceFormat::OpenGLES);
QSurfaceFormat::setDefaultFormat(format);
@ -172,15 +171,11 @@ int main(int argc, char *argv[])
qputenv("QMLSCENE_DEVICE", "softwarecontext");
DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
#endif
/**
* FIXME: 对于麒麟 CPU 设备，调用 QtWebEngine 会导致客户端崩溃；
* 暂时不对 CPU 进行判断，对 wayland 环境下统一处理
*/
if (Utils::isWayland()) {
else {
QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
env = env.trimmed();
/**
@ -199,15 +194,26 @@ int main(int argc, char *argv[])
QSurfaceFormat format;
format.setRenderableType(QSurfaceFormat::OpenGLES);
QSurfaceFormat::setDefaultFormat(format);
}
if (Utils::isPhytium()){
QString env = QString::fromUtf8(qgetenv("QTWEBENGINE_CHROMIUM_FLAGS"));
env = env.trimmed();
env += " --single-process";
qputenv("QTWEBENGINE_CHROMIUM_FLAGS", env.trimmed().toUtf8());
}
#endif
/**
* NOTE: https://zhuanlan.zhihu.com/p/550285855
* 避免 wayland 环境下从 QtWebEngine 后退回到 QWidget 时黑屏闪烁
*/
if (Utils::isWayland()) {
qputenv("QMLSCENE_DEVICE", "softwarecontext");
DApplication::setAttribute(Qt::AA_UseSoftwareOpenGL);
}
#if (QT_VERSION >= QT_VERSION_CHECK(5, 6, 0))
{
// 开启 Hidpi 支持

16
src/utils/utils.cpp
View File

@ -73,6 +73,22 @@ bool Utils::isWayland()
return isWayland;
}
bool Utils::isPhytium()
{
bool isPhytium = false;
QProcess process;
process.start("lscpu");
process.waitForFinished();
QString output = process.readAllStandardOutput();
if (output.contains(QLatin1String("Phytium")))
{
isPhytium = true;
}
return isPhytium;
}
/**
* @brief Utils::initConfig 初始化 config.ini 配置文件，去除废弃字段
*/

1
src/utils/utils.h
View File

@ -12,6 +12,7 @@ public:
static bool isWayland();
static void initConfig();
static bool isUOS();
static bool isPhytium();
static QString initUUID();
static void setQPAPlatform();
static void checkUOSDeveloperMode();

46
translations/spark-store_en.ts
View File

@ -126,9 +126,9 @@
</message>
<message>
<location filename="../src/pages/appintopage.ui" line="244"/>
<location filename="../src/pages/appintopage.cpp" line="185"/>
<location filename="../src/pages/appintopage.cpp" line="323"/>
<location filename="../src/pages/appintopage.cpp" line="493"/>
<location filename="../src/pages/appintopage.cpp" line="190"/>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="498"/>
<source>Download and Install</source>
<translation type="unfinished"></translation>
</message>
@ -180,74 +180,74 @@
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="124"/>
<location filename="../src/pages/appintopage.cpp" line="129"/>
<source>Developer Mode Disabled</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="170"/>
<location filename="../src/pages/appintopage.cpp" line="339"/>
<location filename="../src/pages/appintopage.cpp" line="466"/>
<location filename="../src/pages/appintopage.cpp" line="175"/>
<location filename="../src/pages/appintopage.cpp" line="344"/>
<location filename="../src/pages/appintopage.cpp" line="471"/>
<source>Reinstall</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="177"/>
<location filename="../src/pages/appintopage.cpp" line="182"/>
<source>Upgrade</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="442"/>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="447"/>
<source>Install</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="338"/>
<source>Installing</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>Warning</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<source>The current application does not support deepin, there may be problems</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<source>The current application does not support UOS, there may be problems</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<source>The current application does not support Ubuntu, there may be problems</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>The current application does not support current platform, there may be problems</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>Spark Store</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<source>Uninstall succeeded</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>The URL has been copied to the clipboard</source>
<translation type="unfinished"></translation>
</message>

46
translations/spark-store_es.ts
View File

@ -126,9 +126,9 @@
</message>
<message>
<location filename="../src/pages/appintopage.ui" line="244"/>
<location filename="../src/pages/appintopage.cpp" line="185"/>
<location filename="../src/pages/appintopage.cpp" line="323"/>
<location filename="../src/pages/appintopage.cpp" line="493"/>
<location filename="../src/pages/appintopage.cpp" line="190"/>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="498"/>
<source>Download and Install</source>
<translation>Descargar e instalar</translation>
</message>
@ -180,74 +180,74 @@
<translation>Haga clic en &quot;abrir&quot;</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="124"/>
<location filename="../src/pages/appintopage.cpp" line="129"/>
<source>Developer Mode Disabled</source>
<translation>Se ha desactivado el modo desarrollador</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="170"/>
<location filename="../src/pages/appintopage.cpp" line="339"/>
<location filename="../src/pages/appintopage.cpp" line="466"/>
<location filename="../src/pages/appintopage.cpp" line="175"/>
<location filename="../src/pages/appintopage.cpp" line="344"/>
<location filename="../src/pages/appintopage.cpp" line="471"/>
<source>Reinstall</source>
<translation>Reinstalación</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="177"/>
<location filename="../src/pages/appintopage.cpp" line="182"/>
<source>Upgrade</source>
<translation>Actualización</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="442"/>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="447"/>
<source>Install</source>
<translation>Instalación</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="338"/>
<source>Installing</source>
<translation>Se está instalando</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>Warning</source>
<translation>Aviso</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<source>The current application does not support deepin, there may be problems</source>
<translation>La aplicación actual no admite deepin, puede haber problemas</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<source>The current application does not support UOS, there may be problems</source>
<translation>La aplicación actual no admite uos, puede haber problemas</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<source>The current application does not support Ubuntu, there may be problems</source>
<translation>La aplicación actual no admite ubuntu, puede haber problemas</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>The current application does not support current platform, there may be problems</source>
<translation>La aplicación actual no admite la Plataforma actual, puede haber problemas</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>Spark Store</source>
<translation>SPARK Store</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<source>Uninstall succeeded</source>
<translation>Desinstalación exitosa</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>The URL has been copied to the clipboard</source>
<translation>La URL ha sido copiada al portapapeles</translation>
</message>

46
translations/spark-store_fr.ts
View File

@ -126,9 +126,9 @@
</message>
<message>
<location filename="../src/pages/appintopage.ui" line="244"/>
<location filename="../src/pages/appintopage.cpp" line="185"/>
<location filename="../src/pages/appintopage.cpp" line="323"/>
<location filename="../src/pages/appintopage.cpp" line="493"/>
<location filename="../src/pages/appintopage.cpp" line="190"/>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="498"/>
<source>Download and Install</source>
<translation>Télécharger et installer</translation>
</message>
@ -180,74 +180,74 @@
<translation>Cliquez sur Ouvrir</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="124"/>
<location filename="../src/pages/appintopage.cpp" line="129"/>
<source>Developer Mode Disabled</source>
<translation>Mode développeur désactivé</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="170"/>
<location filename="../src/pages/appintopage.cpp" line="339"/>
<location filename="../src/pages/appintopage.cpp" line="466"/>
<location filename="../src/pages/appintopage.cpp" line="175"/>
<location filename="../src/pages/appintopage.cpp" line="344"/>
<location filename="../src/pages/appintopage.cpp" line="471"/>
<source>Reinstall</source>
<translation>Réinstaller</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="177"/>
<location filename="../src/pages/appintopage.cpp" line="182"/>
<source>Upgrade</source>
<translation>Mise à niveau</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="442"/>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="447"/>
<source>Install</source>
<translation>Installation</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="338"/>
<source>Installing</source>
<translation>Installation en cours</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>Warning</source>
<translation>Avertissement</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<source>The current application does not support deepin, there may be problems</source>
<translation>L&apos;application actuelle ne supporte pas deepin, il peut y avoir un problème</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<source>The current application does not support UOS, there may be problems</source>
<translation>L&apos;application actuelle ne prend pas en charge uos, il peut y avoir un problème</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<source>The current application does not support Ubuntu, there may be problems</source>
<translation>L&apos;application actuelle ne supporte pas Ubuntu, il peut y avoir un problème</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>The current application does not support current platform, there may be problems</source>
<translation>L&apos;application actuelle ne prend pas en charge la plate - forme actuelle, il peut y avoir un problème</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>Spark Store</source>
<translation>Le Spark store</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<source>Uninstall succeeded</source>
<translation>Désinstallation réussie</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>The URL has been copied to the clipboard</source>
<translation>L&apos;URL a été copiée dans le presse - papiers</translation>
</message>

46
translations/spark-store_zh_CN.ts
View File

@ -121,9 +121,9 @@
</message>
<message>
<location filename="../src/pages/appintopage.ui" line="244"/>
<location filename="../src/pages/appintopage.cpp" line="185"/>
<location filename="../src/pages/appintopage.cpp" line="323"/>
<location filename="../src/pages/appintopage.cpp" line="493"/>
<location filename="../src/pages/appintopage.cpp" line="190"/>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="498"/>
<source>Download and Install</source>
<translation>下载并安装</translation>
</message>
@ -180,74 +180,74 @@
<translation>点击跳转</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="124"/>
<location filename="../src/pages/appintopage.cpp" line="129"/>
<source>Developer Mode Disabled</source>
<translation>开发者模式未开启</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="170"/>
<location filename="../src/pages/appintopage.cpp" line="339"/>
<location filename="../src/pages/appintopage.cpp" line="466"/>
<location filename="../src/pages/appintopage.cpp" line="175"/>
<location filename="../src/pages/appintopage.cpp" line="344"/>
<location filename="../src/pages/appintopage.cpp" line="471"/>
<source>Reinstall</source>
<translation>重新安装</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="177"/>
<location filename="../src/pages/appintopage.cpp" line="182"/>
<source>Upgrade</source>
<translation>升级</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="328"/>
<location filename="../src/pages/appintopage.cpp" line="442"/>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="447"/>
<source>Install</source>
<translation>安装</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="333"/>
<location filename="../src/pages/appintopage.cpp" line="338"/>
<source>Installing</source>
<translation>正在安装</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>Warning</source>
<translation>警告</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="421"/>
<location filename="../src/pages/appintopage.cpp" line="426"/>
<source>The current application does not support deepin, there may be problems</source>
<translation>当前应用不支持deepin，安装后可能会出现问题</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="425"/>
<location filename="../src/pages/appintopage.cpp" line="430"/>
<source>The current application does not support UOS, there may be problems</source>
<translation>当前应用不支持UOS，安装后可能会出现问题</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="429"/>
<location filename="../src/pages/appintopage.cpp" line="434"/>
<source>The current application does not support Ubuntu, there may be problems</source>
<translation>当前应用不支持Ubuntu，安装后可能会出现问题</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="433"/>
<location filename="../src/pages/appintopage.cpp" line="438"/>
<source>The current application does not support current platform, there may be problems</source>
<translation>当前应用不支持平台，安装后可能会出现问题</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>Spark Store</source>
<translation>星火应用商店</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="497"/>
<location filename="../src/pages/appintopage.cpp" line="502"/>
<source>Uninstall succeeded</source>
<translation>卸载成功</translation>
</message>
<message>
<location filename="../src/pages/appintopage.cpp" line="510"/>
<location filename="../src/pages/appintopage.cpp" line="515"/>
<source>The URL has been copied to the clipboard</source>
<translation>链接已复制到剪贴板</translation>
</message>