tza/openauto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch back to CrankShaft branding

Browse Source
This commit is contained in:
Simon Dean 2025-01-07 22:35:28 +00:00
parent f456ce8dfa
commit 64b9c1370f
6 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/autoapp/Service/AndroidAutoEntity.cpp
View File

@ -177,7 +177,7 @@ namespace f1x {
serviceDiscoveryResponse.mutable_channels()->Reserve(256);
serviceDiscoveryResponse.set_driver_position(aap_protobuf::service::control::message::DriverPosition::DRIVER_POSITION_RIGHT);
serviceDiscoveryResponse.set_can_play_native_media_during_vr(false);
serviceDiscoveryResponse.set_display_name("CubeOne Journey");
serviceDiscoveryResponse.set_display_name("Crankshaft-NG");
serviceDiscoveryResponse.set_probe_for_support(false);
auto *connectionConfiguration = serviceDiscoveryResponse.mutable_connection_configuration();
@ -191,13 +191,13 @@ namespace f1x {
auto *headUnitInfo = serviceDiscoveryResponse.mutable_headunit_info();
serviceDiscoveryResponse.set_display_name("JourneyOS");
headUnitInfo->set_make("CubeOne");
headUnitInfo->set_model("Journey");
headUnitInfo->set_year("2024");
serviceDiscoveryResponse.set_display_name("Crankshaft-NG");
headUnitInfo->set_make("Crankshaft");
headUnitInfo->set_model("Universal");
headUnitInfo->set_year("2018");
headUnitInfo->set_vehicle_id("2024110822150988");
headUnitInfo->set_head_unit_make("CubeOne");
headUnitInfo->set_head_unit_model("Journey");
headUnitInfo->set_head_unit_make("f1x");
headUnitInfo->set_head_unit_model("Crankshaft-NG Autoapp");
headUnitInfo->set_head_unit_software_build("1");
headUnitInfo->set_head_unit_software_version("1.0");

2
src/autoapp/UI/ConnectDialog.cpp
View File

@ -131,7 +131,7 @@ void ConnectDialog::loadClientList()
if (std::ifstream("/tmp/hotspot_active")) {
ui_->listWidgetClients->show();
//ui_->pushButtonUpdate->show();
ui_->pushButtonUpdate->show();
if (std::ifstream("/tmp/temp_recent_list")) {
QFile versionFile(QString("/tmp/temp_recent_list"));
versionFile.open(QIODevice::ReadOnly);

6
src/autoapp/UI/MainWindow.cpp
View File

@ -2142,7 +2142,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
this->openautoupdate = check_file_exist("/tmp/openauto_update_available");
this->systemupdate = check_file_exist("/tmp/system_update_available");
/*if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) {
if (this->csmtupdate || this->udevupdate || this->openautoupdate || this->systemupdate) {
if (ui_->pushButtonUpdate->isVisible() == false) {
ui_->pushButtonUpdate->show();
ui_->label_left->show();
@ -2153,7 +2153,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
ui_->label_dummy_right->show();
}
}
} else {*/
} else {
if (ui_->pushButtonUpdate->isVisible() == true) {
ui_->pushButtonUpdate->hide();
ui_->label_left->hide();
@ -2163,7 +2163,7 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
ui_->devlabel_right->show();
}
}
// }
}
if (std::ifstream("/tmp/btdevice") || std::ifstream("/tmp/media_playing") || std::ifstream("/tmp/dev_mode_enabled") || std::ifstream("/tmp/android_device")) {
if (ui_->labelLock->isVisible() == false) {

3
src/autoapp/UI/UpdateDialog.cpp
View File

@ -36,8 +36,7 @@ UpdateDialog::UpdateDialog(QWidget *parent)
ui_->labelSystemReadyInstall->hide();
ui_->labelUpdateChecking->hide();
ui_->pushButtonUpdateCancel->hide();
// TODO: Restore once switched
//updateCheck();
updateCheck();
watcher_tmp = new QFileSystemWatcher(this);
watcher_tmp->addPath("/tmp");

2
src/autoapp/UI/mainwindow.ui
View File

@ -305,7 +305,7 @@ color: rgb(211, 215, 207);</string>
<string notr="true">background-color: rgba(255, 255, 255, 0);</string>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:normal; color:#7700C8;&quot;&gt;Journey&lt;/span&gt;&lt;span style=&quot; font-style:normal; color:#ffffff;&quot;&gt;OS &lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-style:normal; color:#ffffff;&quot;&gt;crank&lt;/span&gt;&lt;span style=&quot; font-style:normal; color:#5ce739;&quot;&gt;shaft &lt;/span&gt;&lt;span style=&quot; font-style:normal; color:#40bfbf;&quot;&gt;NG &lt;/span&gt;&lt;span style=&quot; font-style:normal; color:#888a85;&quot;&gt;- OpenCarOS&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="alignment">
<set>Qt::AlignCenter</set>

2
src/btservice/AndroidBluetoothService.cpp
View File

@ -32,7 +32,7 @@ namespace f1x::openauto::btservice {
serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceClassIds, classId);
serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceName, "OpenAuto Bluetooth Service");
serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceDescription, "AndroidAuto WiFi projection automatic setup");
serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceProvider, "cubeone.co.uk");
serviceInfo_.setAttribute(QBluetoothServiceInfo::ServiceProvider, "f1xstudio.com");
serviceInfo_.setServiceUuid(serviceUuid);
QBluetoothServiceInfo::Sequence publicBrowse;