QuasarApp/Hanoi-Towers
4
0
Fork 0
mirror of https://github.com/QuasarApp/Hanoi-Towers.git synced 2025-04-28 10:44:32 +00:00
Code Issues Projects Releases Wiki Activity

update Heart Lib

Browse Source
This commit is contained in:
Andrei Yankovich 2021-02-22 20:00:42 +03:00
parent 9c7994b3f0
commit ecaa0081c5
10 changed files with 111 additions and 102 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
HanoiTowers/Server/hanoiserver.cpp
View File

@ -42,19 +42,23 @@ HanoiServer::HanoiServer() {
QCoreApplication ::exit(3);
}
registerPackageType<UserData>();
registerPackageType<UserDataRequest>();
}
QH::ParserResult HanoiServer::parsePackage(const QH::Package &pkg,
QH::ParserResult HanoiServer::parsePackage(QH::PKG::AbstractData *pkg,
const QH::Header &pkgHeader,
const QH::AbstractNodeInfo *sender) {
auto parentResult = SingleServer::parsePackage(pkg, sender);
auto parentResult = SingleServer::parsePackage(pkg, pkgHeader, sender);
if (parentResult != QH::ParserResult::NotProcessed) {
return parentResult;
}
if (H_16<UserData>() == pkg.hdr.command) {
auto obj = QSharedPointer<UserData>::create(pkg).
staticCast<QH::PKG::DBObject>();
if (H_16<UserData>() == pkg->cmd()) {
auto obj = QSharedPointer<UserData>(static_cast<UserData*>(pkg));
auto requesterId = getSender(sender, obj.data());
@ -65,9 +69,10 @@ QH::ParserResult HanoiServer::parsePackage(const QH::Package &pkg,
return QH::ParserResult::Processed;
} else if (H_16<UserDataRequest>() == pkg.hdr.command) {
UserDataRequest obj(pkg);
if (!workWirthUserData(&obj, sender, &pkg.hdr)) {
} else if (H_16<UserDataRequest>() == pkg->cmd()) {
auto obj = static_cast<UserDataRequest*>(pkg);
if (!workWirthUserData(obj, sender, &pkgHeader)) {
return QH::ParserResult::Error;
}

3
HanoiTowers/Server/hanoiserver.h
View File

@ -13,7 +13,8 @@ public:
HanoiServer();
protected:
QH::ParserResult parsePackage(const QH::Package &pkg,
QH::ParserResult parsePackage(QH::PKG::AbstractData *pkg,
const QH::Header &pkgHeader,
const QH::AbstractNodeInfo *sender) override;
QStringList SQLSources() const override;

14
HanoiTowers/client/hanoiclient.cpp
View File

@ -32,17 +32,19 @@ HanoiClient::HanoiClient() {
new QH::SqlDBWriter());
qRegisterMetaType<QSharedPointer<LocalUser>>();
registerPackageType<UserData>();
}
QH::ParserResult HanoiClient::parsePackage(const QH::Package &pkg,
QH::ParserResult HanoiClient::parsePackage(QH::PKG::AbstractData *pkg,
const QH::Header &pkgHeader,
const QH::AbstractNodeInfo *sender) {
auto parentResult = SingleServerClient::parsePackage(pkg, sender);
auto parentResult = SingleServerClient::parsePackage(pkg, pkgHeader, sender);
if (parentResult != QH::ParserResult::NotProcessed) {
return parentResult;
}
if (H_16<UserData>() == pkg.hdr.command) {
auto obj = QSharedPointer<UserData>::create(pkg);
if (H_16<UserData>() == pkg->cmd()) {
auto obj = QSharedPointer<UserData>(static_cast<UserData*>(pkg));
auto localUser = getLocalUser(obj->name());
if (obj->updateTime() > localUser->updateTime()) {
@ -209,9 +211,9 @@ bool HanoiClient::setProfile(const QString &userId,
emit profileChanged(user);
if ( user->online()) {
if ( user->online() && connectToServer()) {
auto userMember = DataConverter::toUserMember(user);
connectToServer(&userMember);
login(userMember);
}
return true;

3
HanoiTowers/client/hanoiclient.h
View File

@ -35,7 +35,8 @@ class HanoiClient: public QH::SingleServerClient
public:
HanoiClient();
QH::ParserResult parsePackage(const QH::Package &pkg,
QH::ParserResult parsePackage(QH::PKG::AbstractData *pkg,
const QH::Header &pkgHeader,
const QH::AbstractNodeInfo *sender) override;

34
HanoiTowers/client/languages/en.ts
View File

@ -23,73 +23,73 @@
<context>
<name>BackEnd</name>
<message>
<location filename="../backEnd.cpp" line="60"/>
<location filename="../backEnd.cpp" line="61"/>
<source>Create new user</source>
<translation>Create new user</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="141"/>
<location filename="../backEnd.cpp" line="142"/>
<source>Connect error</source>
<translation>Connection error</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="142"/>
<location filename="../backEnd.cpp" line="143"/>
<source>Failed to connect to server please check network connection befor login</source>
<translation>Failed to connect to server please check network connection befor login</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="168"/>
<location filename="../backEnd.cpp" line="169"/>
<source>login error</source>
<translation>Login error</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="169"/>
<location filename="../backEnd.cpp" line="170"/>
<source>Failed to login into online account, please check your password and username</source>
<translation>Failed to login into online account, please check your password and username</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="179"/>
<location filename="../backEnd.cpp" line="180"/>
<source>Register online error</source>
<translation></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="180"/>
<location filename="../backEnd.cpp" line="181"/>
<source>Failed to register this account, if this account was created by you, try to restore it.</source>
<translation>Failed to register this account, if this account was created by you, try to restore it.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="190"/>
<location filename="../backEnd.cpp" line="212"/>
<location filename="../backEnd.cpp" line="191"/>
<location filename="../backEnd.cpp" line="213"/>
<source>Server error</source>
<translation>Server error</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="197"/>
<location filename="../backEnd.cpp" line="198"/>
<source>User with this id is not registered. If it you then use please the sigup form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="205"/>
<location filename="../backEnd.cpp" line="206"/>
<source>User with this id already registered. If it you then use please the login form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="324"/>
<location filename="../backEnd.cpp" line="327"/>
<source>Create user error</source>
<translation>User create error</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="325"/>
<location filename="../backEnd.cpp" line="328"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Failed to create a new user, This name %0 alredy used.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>current profile not online!</source>
<translation>Current profile is offline!</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>Remove online error</source>
<translation>Error remove online user data</translation>
</message>
@ -181,12 +181,12 @@
<context>
<name>HanoiClient</name>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>Local user has been updated</source>
<translation>Local user has been updated</translation>
</message>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>local user accept nbew data from the server.</source>
<translation>Local user accept new data from the server.</translation>
</message>

34
HanoiTowers/client/languages/ja.ts
View File

@ -27,73 +27,73 @@
<context>
<name>BackEnd</name>
<message>
<location filename="../backEnd.cpp" line="60"/>
<location filename="../backEnd.cpp" line="61"/>
<source>Create new user</source>
<translation>新規ユーザーの作成</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="141"/>
<location filename="../backEnd.cpp" line="142"/>
<source>Connect error</source>
<translation>接続エラー</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="142"/>
<location filename="../backEnd.cpp" line="143"/>
<source>Failed to connect to server please check network connection befor login</source>
<translation>サーバへの接続に失敗しました</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="168"/>
<location filename="../backEnd.cpp" line="169"/>
<source>login error</source>
<translation>ログインエラー</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="169"/>
<location filename="../backEnd.cpp" line="170"/>
<source>Failed to login into online account, please check your password and username</source>
<translation>オンラインアカウントにログインできませんでした。パスワードとユーザー名を確認してください</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="179"/>
<location filename="../backEnd.cpp" line="180"/>
<source>Register online error</source>
<translation>登録オンラインエラー</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="180"/>
<location filename="../backEnd.cpp" line="181"/>
<source>Failed to register this account, if this account was created by you, try to restore it.</source>
<translation>このアカウントが登録されなかった場合、このアカウントが作成された場合、それを元に戻してください。</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="190"/>
<location filename="../backEnd.cpp" line="212"/>
<location filename="../backEnd.cpp" line="191"/>
<location filename="../backEnd.cpp" line="213"/>
<source>Server error</source>
<translation>サーバエラー</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="197"/>
<location filename="../backEnd.cpp" line="198"/>
<source>User with this id is not registered. If it you then use please the sigup form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="205"/>
<location filename="../backEnd.cpp" line="206"/>
<source>User with this id already registered. If it you then use please the login form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="324"/>
<location filename="../backEnd.cpp" line="327"/>
<source>Create user error</source>
<translation>ユーザーエラーの作成</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="325"/>
<location filename="../backEnd.cpp" line="328"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>新しいユーザーの作成に失敗しました。名前 %0 はすでに使用されています。</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>current profile not online!</source>
<translation>現在のプロファイルはオフラインです！</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>Remove online error</source>
<translation>オンラインユーザーデータの削除中にエラーが発生しました</translation>
</message>
@ -192,12 +192,12 @@
<context>
<name>HanoiClient</name>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>Local user has been updated</source>
<translation>ローカルユーザーが更新されました</translation>
</message>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>local user accept nbew data from the server.</source>
<translation>ローカルユーザはサーバからNBEWデータを受け入れます。</translation>
</message>

34
HanoiTowers/client/languages/ru.ts
View File

@ -27,73 +27,73 @@
<context>
<name>BackEnd</name>
<message>
<location filename="../backEnd.cpp" line="60"/>
<location filename="../backEnd.cpp" line="61"/>
<source>Create new user</source>
<translation>Создать нового пользователя</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="141"/>
<location filename="../backEnd.cpp" line="142"/>
<source>Connect error</source>
<translation>Ошибка подключения</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="142"/>
<location filename="../backEnd.cpp" line="143"/>
<source>Failed to connect to server please check network connection befor login</source>
<translation>Ошибка подключения к серверу, пожалуйста проверьте интернет соединение перед входом</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="168"/>
<location filename="../backEnd.cpp" line="169"/>
<source>login error</source>
<translation>Ошибк входа</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="169"/>
<location filename="../backEnd.cpp" line="170"/>
<source>Failed to login into online account, please check your password and username</source>
<translation>Ошибка входа в онлайн аккаунт, пожалуйста проверьте свой логин и пароль</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="179"/>
<location filename="../backEnd.cpp" line="180"/>
<source>Register online error</source>
<translation>Ошибка регистрации</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="180"/>
<location filename="../backEnd.cpp" line="181"/>
<source>Failed to register this account, if this account was created by you, try to restore it.</source>
<translation>Не удалось зарегистрировать аккаунт, если этот аккаунт был создан вами попробуйте восстановить его.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="190"/>
<location filename="../backEnd.cpp" line="212"/>
<location filename="../backEnd.cpp" line="191"/>
<location filename="../backEnd.cpp" line="213"/>
<source>Server error</source>
<translation>Ошибка сервера</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="197"/>
<location filename="../backEnd.cpp" line="198"/>
<source>User with this id is not registered. If it you then use please the sigup form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="205"/>
<location filename="../backEnd.cpp" line="206"/>
<source>User with this id already registered. If it you then use please the login form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="324"/>
<location filename="../backEnd.cpp" line="327"/>
<source>Create user error</source>
<translation>Ошибка создания пользователя</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="325"/>
<location filename="../backEnd.cpp" line="328"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Не удалось создать пользователя. Данное имя %0 уже используется</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>current profile not online!</source>
<translation>Текущий профиль не в сети!</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>Remove online error</source>
<translation>Ошибка удаления данных онлайн-пользователя</translation>
</message>
@ -192,12 +192,12 @@
<context>
<name>HanoiClient</name>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>Local user has been updated</source>
<translation>Локальный пользователь обновлён</translation>
</message>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>local user accept nbew data from the server.</source>
<translation>Локальный пользователь принял новые данные с сервера.</translation>
</message>

34
HanoiTowers/client/languages/tr.ts
View File

@ -27,73 +27,73 @@
<context>
<name>BackEnd</name>
<message>
<location filename="../backEnd.cpp" line="60"/>
<location filename="../backEnd.cpp" line="61"/>
<source>Create new user</source>
<translation>Yeni kullanıcı oluştur</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="141"/>
<location filename="../backEnd.cpp" line="142"/>
<source>Connect error</source>
<translation>Bağlantı hatası</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="142"/>
<location filename="../backEnd.cpp" line="143"/>
<source>Failed to connect to server please check network connection befor login</source>
<translation>Sunucuya bağlanılamadı, lütfen oturum açmadan önce ağ bağlantısını kontrol edin</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="168"/>
<location filename="../backEnd.cpp" line="169"/>
<source>login error</source>
<translation>sisteme giriş hatası</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="169"/>
<location filename="../backEnd.cpp" line="170"/>
<source>Failed to login into online account, please check your password and username</source>
<translation>Çevrimiçi hesaba giriş yapılamadı, lütfen şifrenizi ve kullanıcı adınızı kontrol edin</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="179"/>
<location filename="../backEnd.cpp" line="180"/>
<source>Register online error</source>
<translation>Çevrimiçi kayıt hatası</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="180"/>
<location filename="../backEnd.cpp" line="181"/>
<source>Failed to register this account, if this account was created by you, try to restore it.</source>
<translation>Bu hesap kaydedilemedi, bu hesap sizin tarafınızdan oluşturulduysa, geri yüklemeyi deneyin.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="190"/>
<location filename="../backEnd.cpp" line="212"/>
<location filename="../backEnd.cpp" line="191"/>
<location filename="../backEnd.cpp" line="213"/>
<source>Server error</source>
<translation>Server hatası</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="197"/>
<location filename="../backEnd.cpp" line="198"/>
<source>User with this id is not registered. If it you then use please the sigup form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="205"/>
<location filename="../backEnd.cpp" line="206"/>
<source>User with this id already registered. If it you then use please the login form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="324"/>
<location filename="../backEnd.cpp" line="327"/>
<source>Create user error</source>
<translation>Kullanıcı hatası oluştur</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="325"/>
<location filename="../backEnd.cpp" line="328"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Yeni bir kullanıcı oluşturulamadı, %0 adı kullanıldı.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>current profile not online!</source>
<translation>Mevcut profil çevrimdışı!</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>Remove online error</source>
<translation>Çevrimiçi kullanıcı verilerini kaldırma hatası</translation>
</message>
@ -193,12 +193,12 @@ Bu seviye için minimum adımlar: %2</translation>
<context>
<name>HanoiClient</name>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>Local user has been updated</source>
<translation>Yerel kullanıcı güncellendi</translation>
</message>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>local user accept nbew data from the server.</source>
<translation>yerel kullanıcı sunucudan yeni verileri kabul eder.</translation>
</message>

34
HanoiTowers/client/languages/ua.ts
View File

@ -27,73 +27,73 @@
<context>
<name>BackEnd</name>
<message>
<location filename="../backEnd.cpp" line="60"/>
<location filename="../backEnd.cpp" line="61"/>
<source>Create new user</source>
<translation>Створити нового користувача</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="141"/>
<location filename="../backEnd.cpp" line="142"/>
<source>Connect error</source>
<translation>Помилка підключення</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="142"/>
<location filename="../backEnd.cpp" line="143"/>
<source>Failed to connect to server please check network connection befor login</source>
<translation>Не вдалося підключитися до сервера, перевірте мережеве підключення для входу</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="168"/>
<location filename="../backEnd.cpp" line="169"/>
<source>login error</source>
<translation>помилка входу</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="169"/>
<location filename="../backEnd.cpp" line="170"/>
<source>Failed to login into online account, please check your password and username</source>
<translation>Не вдалося увійти в онлайн-акаунт, перевірте свій пароль та ім’я користувача</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="179"/>
<location filename="../backEnd.cpp" line="180"/>
<source>Register online error</source>
<translation>помилка реєстрації в Інтернеті</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="180"/>
<location filename="../backEnd.cpp" line="181"/>
<source>Failed to register this account, if this account was created by you, try to restore it.</source>
<translation>Не вдалося зареєструвати цей обліковий запис, якщо цей обліковий запис був створений вами, спробуйте відновити його.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="190"/>
<location filename="../backEnd.cpp" line="212"/>
<location filename="../backEnd.cpp" line="191"/>
<location filename="../backEnd.cpp" line="213"/>
<source>Server error</source>
<translation>Помилка серверу</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="197"/>
<location filename="../backEnd.cpp" line="198"/>
<source>User with this id is not registered. If it you then use please the sigup form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="205"/>
<location filename="../backEnd.cpp" line="206"/>
<source>User with this id already registered. If it you then use please the login form.</source>
<translation type="unfinished"></translation>
</message>
<message>
<location filename="../backEnd.cpp" line="324"/>
<location filename="../backEnd.cpp" line="327"/>
<source>Create user error</source>
<translation>Помилка створення користувача</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="325"/>
<location filename="../backEnd.cpp" line="328"/>
<source>Failed to create a new user, The name %0 alredy used.</source>
<translation>Не вдалося створити нового користувача, ім’я %0 вже використовується.</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>current profile not online!</source>
<translation>Поточний профіль офлайн!</translation>
</message>
<message>
<location filename="../backEnd.cpp" line="356"/>
<location filename="../backEnd.cpp" line="359"/>
<source>Remove online error</source>
<translation>Помилка видалення онлайн даних користувачів</translation>
</message>
@ -193,12 +193,12 @@
<context>
<name>HanoiClient</name>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>Local user has been updated</source>
<translation>Локальний користувач був оновлений</translation>
</message>
<message>
<location filename="../hanoiclient.cpp" line="92"/>
<location filename="../hanoiclient.cpp" line="55"/>
<source>local user accept nbew data from the server.</source>
<translation>локальний користувач приймає нові дані з сервера.</translation>
</message>

2
Heart

@ -1 +1 @@
Subproject commit f135c38e7c8e7d44ad4bd3c5d365a6d81d0f543b
Subproject commit 0b883ba7a2abd839ef5b36a9b9135cdd3a87843c