- Implement `toggleMaterialStatus` in `AccountSettingsWindow` for UI control and threading integration. - Enhance `MaterialDAO` with numeric validation for `lastNumbers` field to ensure data integrity. - Update `PayByCardScript` and `PayByPhoneScript` to handle PIN entry if required after payment confirmation. - Introduce dynamic UI adjustments for material toggling, including a new toggle button and layout refinements. - Add documentation for task logic in `ozon_tasks.md` and `black_tasks.md`. - Switch default currency in `GetCardInfoScript` (Black app) from USD to ARS.
153 lines
5.7 KiB
C++
153 lines
5.7 KiB
C++
#include "GetCardInfoScript.h"
|
||
|
||
#include <QThread>
|
||
|
||
#include <QJsonDocument>
|
||
#include <QJsonObject>
|
||
|
||
#include "adb/AdbUtils.h"
|
||
#include "dao/MaterialDAO.h"
|
||
#include "dao/BankProfileDAO.h"
|
||
#include "dao/DeviceDAO.h"
|
||
#include "net/NetworkService.h"
|
||
|
||
namespace Black {
|
||
|
||
GetCardInfoScript::GetCardInfoScript(
|
||
QString deviceId,
|
||
QString appCode,
|
||
QObject *parent
|
||
) : CommonScript(parent),
|
||
m_deviceId(std::move(deviceId)),
|
||
m_appCode(std::move(appCode)) {
|
||
}
|
||
|
||
GetCardInfoScript::~GetCardInfoScript() = default;
|
||
|
||
void GetCardInfoScript::doStart() {
|
||
DeviceInfo device = DeviceDAO::getDeviceById(m_deviceId); if (device.id.isEmpty()) device = DeviceDAO::findByAdbSerial(m_deviceId); if (!device.adbSerial.isEmpty()) m_deviceId = device.adbSerial;
|
||
const BankProfileInfo app = BankProfileDAO::getApplication(device.id, m_appCode);
|
||
|
||
if (device.id.isEmpty() || app.id == -1) {
|
||
m_error = "Device or app not found: " + m_deviceId + " " + m_appCode;
|
||
qCritical() << m_error;
|
||
emit finishedWithResult(m_error);
|
||
return;
|
||
}
|
||
|
||
// Читаем текущий экран
|
||
xmlScreenParser.parseAndSaveXml(AdbUtils::getScreenDumpAsXml(m_deviceId, ++m_counter));
|
||
|
||
// Если не на домашнем экране — перезапускаем
|
||
if (!xmlScreenParser.isHomeScreen()) {
|
||
qDebug() << "[Black::GetCardInfo] Not on home screen, restarting app...";
|
||
if (!runAppAndGoToHomeScreen(m_deviceId, app.package, app.pinCode,
|
||
device.screenWidth, device.screenHeight)) {
|
||
m_error = "Cannot reach home screen: " + m_deviceId + " " + m_appCode;
|
||
qWarning() << m_error;
|
||
AdbUtils::tryToKillApplication(m_deviceId, app.package);
|
||
emit finishedWithResult(m_error);
|
||
return;
|
||
}
|
||
xmlScreenParser.parseAndSaveXml(AdbUtils::getScreenDumpAsXml(m_deviceId, ++m_counter));
|
||
}
|
||
|
||
// 1. Парсим баланс с домашнего экрана
|
||
const double balance = xmlScreenParser.parseBalanceFromHomeScreen();
|
||
qDebug() << "[Black::GetCardInfo] balance from home:" << balance;
|
||
BankProfileDAO::updateAmount(app.id, balance);
|
||
|
||
// 2. Нажимаем "Tu CVU" на домашнем экране
|
||
Node cvuButton = xmlScreenParser.findButtonNode("Tu CVU", false);
|
||
if (cvuButton.isEmpty()) {
|
||
m_error = "Cannot find Tu CVU button: " + m_deviceId;
|
||
qWarning() << m_error;
|
||
AdbUtils::tryToKillApplication(m_deviceId, app.package);
|
||
emit finishedWithResult(m_error);
|
||
return;
|
||
}
|
||
|
||
AdbUtils::makeTap(m_deviceId, cvuButton.x(), cvuButton.y());
|
||
QThread::msleep(2000);
|
||
|
||
// 3. Ждём экран CVU
|
||
bool cvuScreenFound = false;
|
||
for (int attempt = 0; attempt < 5; ++attempt) {
|
||
xmlScreenParser.parseAndSaveXml(AdbUtils::getScreenDumpAsXml(m_deviceId, ++m_counter));
|
||
if (xmlScreenParser.isCVUScreen()) {
|
||
cvuScreenFound = true;
|
||
break;
|
||
}
|
||
QThread::msleep(1000);
|
||
}
|
||
|
||
if (!cvuScreenFound) {
|
||
m_error = "CVU screen not detected: " + m_deviceId;
|
||
qWarning() << m_error;
|
||
AdbUtils::tryToKillApplication(m_deviceId, app.package);
|
||
emit finishedWithResult(m_error);
|
||
return;
|
||
}
|
||
|
||
// 4. Парсим номер CVU
|
||
const QString cvuNumber = xmlScreenParser.parseCVUNumber();
|
||
qDebug() << "[Black::GetCardInfo] CVU number:" << cvuNumber;
|
||
|
||
if (cvuNumber.isEmpty()) {
|
||
m_error = "Cannot parse CVU number: " + m_deviceId;
|
||
qWarning() << m_error;
|
||
AdbUtils::tryToKillApplication(m_deviceId, app.package);
|
||
emit finishedWithResult(m_error);
|
||
return;
|
||
}
|
||
|
||
// 5. Сохраняем аккаунт в БД (lastNumbers = последние 4 цифры CVU)
|
||
const QString lastNumbers = cvuNumber.right(4);
|
||
|
||
MaterialInfo account;
|
||
account.deviceId = device.id;
|
||
account.appCode = m_appCode;
|
||
account.lastNumbers = lastNumbers;
|
||
account.cardNumber = cvuNumber;
|
||
account.amount = balance;
|
||
account.currency = "ARS";
|
||
account.description = "CVU";
|
||
account.status = MaterialStatus::Active;
|
||
account.updateTime = QDateTime::currentDateTimeUtc();
|
||
|
||
if (!MaterialDAO::upsertAccount(account)) {
|
||
qWarning() << "[Black::GetCardInfo] Failed to upsert account";
|
||
}
|
||
|
||
// 6. Отправляем материал на сервер (если ещё нет material_id)
|
||
const MaterialInfo savedAccount = MaterialDAO::findAppAccount(device.id, m_appCode, lastNumbers);
|
||
const BankProfileInfo updatedApp = BankProfileDAO::getApplication(device.id, m_appCode);
|
||
|
||
if (savedAccount.id != -1 && !updatedApp.bankProfileId.isEmpty()) {
|
||
if (savedAccount.materialId.isEmpty()) {
|
||
NetworkService ns;
|
||
ns.setDeviceId(m_deviceId);
|
||
|
||
QJsonObject materialBody;
|
||
materialBody["bank_profile_id"] = updatedApp.bankProfileId;
|
||
materialBody["card_number"] = savedAccount.cardNumber;
|
||
materialBody["name"] = updatedApp.fullName;
|
||
ns.setPayload(QJsonDocument(materialBody).toJson());
|
||
ns.addExtra("account_id", savedAccount.id);
|
||
ns.postMaterial();
|
||
qDebug() << "[Black::GetCardInfo] postMaterial done for CVU" << lastNumbers;
|
||
} else {
|
||
qDebug() << "[Black::GetCardInfo] material already exists for CVU" << lastNumbers << ", skipping";
|
||
}
|
||
} else {
|
||
qWarning() << "[Black::GetCardInfo] bankProfileId empty or account not found, skipping material";
|
||
}
|
||
|
||
qDebug() << "[Black::GetCardInfo] Done. CVU:" << cvuNumber << "balance:" << balance;
|
||
|
||
AdbUtils::tryToKillApplication(m_deviceId, app.package);
|
||
emit finishedWithResult(m_error);
|
||
}
|
||
|
||
} // namespace Black
|