mirror of
https://github.com/overte-org/overte.git
synced 2025-07-24 01:23:55 +02:00
Unique command line to run Interface on Quest.
This commit is contained in:
parent
0e46007d84
commit
6032fde5e5
3 changed files with 21 additions and 11 deletions
|
@ -38,7 +38,7 @@ Nitpick::Nitpick(QWidget* parent) : QMainWindow(parent) {
|
||||||
|
|
||||||
_ui.plainTextEdit->setReadOnly(true);
|
_ui.plainTextEdit->setReadOnly(true);
|
||||||
|
|
||||||
setWindowTitle("Nitpick - v3.1.2");
|
setWindowTitle("Nitpick - v3.1.3");
|
||||||
|
|
||||||
clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
|
clientProfiles << "VR-High" << "Desktop-High" << "Desktop-Low" << "Mobile-Touch" << "VR-Standalone";
|
||||||
_ui.clientProfileComboBox->insertItems(0, clientProfiles);
|
_ui.clientProfileComboBox->insertItems(0, clientProfiles);
|
||||||
|
|
|
@ -98,12 +98,12 @@ void TestRunnerMobile::connectDevice() {
|
||||||
QString deviceID = tokens[0];
|
QString deviceID = tokens[0];
|
||||||
|
|
||||||
QString modelID = tokens[3].split(':')[1];
|
QString modelID = tokens[3].split(':')[1];
|
||||||
QString modelName = "UNKNOWN";
|
_modelName = "UNKNOWN";
|
||||||
if (modelNames.count(modelID) == 1) {
|
if (modelNames.count(modelID) == 1) {
|
||||||
modelName = modelNames[modelID];
|
_modelName = modelNames[modelID];
|
||||||
}
|
}
|
||||||
|
|
||||||
_detectedDeviceLabel->setText(modelName + " [" + deviceID + "]");
|
_detectedDeviceLabel->setText(_modelName + " [" + deviceID + "]");
|
||||||
_pullFolderButton->setEnabled(true);
|
_pullFolderButton->setEnabled(true);
|
||||||
_folderLineEdit->setEnabled(true);
|
_folderLineEdit->setEnabled(true);
|
||||||
_downloadAPKPushbutton->setEnabled(true);
|
_downloadAPKPushbutton->setEnabled(true);
|
||||||
|
@ -198,8 +198,16 @@ void TestRunnerMobile::runInterface() {
|
||||||
? QString("https://raw.githubusercontent.com/") + nitpick->getSelectedUser() + "/hifi_tests/" + nitpick->getSelectedBranch() + "/tests/testRecursive.js"
|
? QString("https://raw.githubusercontent.com/") + nitpick->getSelectedUser() + "/hifi_tests/" + nitpick->getSelectedBranch() + "/tests/testRecursive.js"
|
||||||
: _scriptURL->text();
|
: _scriptURL->text();
|
||||||
|
|
||||||
|
// Quest and Android have different commands to run interface
|
||||||
|
QString startCommand;
|
||||||
|
if (_modelName == "Quest") {
|
||||||
|
startCommand = "io.highfidelity.questInterface/.PermissionsChecker";
|
||||||
|
} else {
|
||||||
|
startCommand = "io.highfidelity.hifiinterface/.PermissionChecker";
|
||||||
|
}
|
||||||
|
|
||||||
QString command = _adbInterface->getAdbCommand() +
|
QString command = _adbInterface->getAdbCommand() +
|
||||||
" shell am start -n io.highfidelity.hifiinterface/.PermissionChecker" +
|
" shell am start -n " + startCommand +
|
||||||
" --es args \\\"" +
|
" --es args \\\"" +
|
||||||
" --url file:///~/serverless/tutorial.json" +
|
" --url file:///~/serverless/tutorial.json" +
|
||||||
" --no-updater" +
|
" --no-updater" +
|
||||||
|
|
|
@ -75,5 +75,7 @@ private:
|
||||||
std::map<QString, QString> modelNames;
|
std::map<QString, QString> modelNames;
|
||||||
|
|
||||||
AdbInterface* _adbInterface;
|
AdbInterface* _adbInterface;
|
||||||
|
|
||||||
|
QString _modelName;
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue