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

Add day/night by gpio / gui fixes / lux values to gui / video stop by go back

Browse Source
This commit is contained in:
hawkeyexp 2018-11-30 12:30:49 +01:00
parent 3621a20cda
commit c30bdeb20b
7 changed files with 4723 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/autoapp/Service/VideoService.cpp
View File

@ -159,6 +159,12 @@ void VideoService::onVideoFocusRequest(const aasdk::proto::messages::VideoFocusR
this->sendVideoFocusIndication(); this->sendVideoFocusIndication();
channel_->receive(this->shared_from_this()); channel_->receive(this->shared_from_this());
// stop video service on go back to openauto
if (request.focus_mode() == 2) {
OPENAUTO_LOG(info) << "[VideoService] Stop video service...";
VideoService::stop();
}
} }
void VideoService::sendVideoFocusIndication() void VideoService::sendVideoFocusIndication()

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

@ -175,6 +175,9 @@ MainWindow::MainWindow(configuration::IConfiguration::Pointer configuration, QWi
// by default hide bluetooth button on init // by default hide bluetooth button on init
ui_->pushButtonBluetooth->hide(); ui_->pushButtonBluetooth->hide();
// by default hide bluetooth button on init
ui_->pushButtonAndroidAuto->hide();
// by default hide media player // by default hide media player
ui_->mediaWidget->hide(); ui_->mediaWidget->hide();
ui_->pushButtonUSB->hide(); ui_->pushButtonUSB->hide();
@ -1568,11 +1571,12 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
// clock viibility by settings // clock viibility by settings
if (!this->configuration_->showClock()) { if (!this->configuration_->showClock()) {
ui_->Digital_clock->hide(); ui_->Digital_clock->hide();
ui_->oldmenuDummy->show();
ui_->bigClock->hide(); ui_->bigClock->hide();
this->NoClock = true; this->NoClock = true;
} else { } else {
this->NoClock = false; this->NoClock = false;
if (this->UseBigClock) { if (this->UseBigClock && ui_->oldmenuWidget->isVisible() == true) {
ui_->oldmenuDummy->hide(); ui_->oldmenuDummy->hide();
ui_->bigClock->show(); ui_->bigClock->show();
if (oldGUIStyle) { if (oldGUIStyle) {
@ -1603,4 +1607,23 @@ void f1x::openauto::autoapp::ui::MainWindow::tmpChanged()
if (QString::number(this->configuration_->getAlphaTrans()) != QString::number(ui_->horizontalSliderAlpha->value())) { if (QString::number(this->configuration_->getAlphaTrans()) != QString::number(ui_->horizontalSliderAlpha->value())) {
ui_->horizontalSliderAlpha->setValue(static_cast<int>(this->configuration_->getAlphaTrans())); ui_->horizontalSliderAlpha->setValue(static_cast<int>(this->configuration_->getAlphaTrans()));
} }
// read value from tsl2561
QFileInfo lightsensorFile("/tmp/tsl2561");
if (lightsensorFile.exists()) {
QFile paramFile("/tmp/tsl2561");
paramFile.open(QIODevice::ReadOnly);
QTextStream data(&paramFile);
QStringList value = data.readAll().split("\n");
paramFile.close();
if (ui_->label_left->isVisible() == false) {
ui_->label_left->show();
}
ui_->label_left->setText("Lux: " + value[0]);
} else {
if (ui_->label_left->isVisible() == true) {
ui_->label_left->hide();
ui_->label_left->setText("");
}
}
} }

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

@ -272,6 +272,8 @@ void SettingsWindow::onSave()
params.append("#"); params.append("#");
params.append( std::string(ui_->comboBoxLS->currentText().split(" ")[0].toStdString()) ); params.append( std::string(ui_->comboBoxLS->currentText().split(" ")[0].toStdString()) );
params.append("#"); params.append("#");
params.append( std::string(ui_->comboBoxDayNight->currentText().toStdString()) );
params.append("#");
system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str()); system((std::string("/usr/local/bin/autoapp_helper setparams#") + std::string(params) + std::string(" &") ).c_str());
@ -725,6 +727,7 @@ void SettingsWindow::loadSystemValues()
} else { } else {
ui_->comboBoxLS->setCurrentIndex(0); ui_->comboBoxLS->setCurrentIndex(0);
} }
ui_->comboBoxDayNight->setCurrentText(getparams[41]);
} }
} }

4253
src/autoapp/UI/mainwindow.old Normal file
View File

File diff suppressed because it is too large Load Diff

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

@ -121,6 +121,41 @@ color: rgb(255, 255, 255);</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_left">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(0, 0, 0, 0);
color: rgb(211, 215, 207);</string>
</property>
<property name="text">
<string/>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="Header_Label"> <widget class="QLabel" name="Header_Label">
<property name="sizePolicy"> <property name="sizePolicy">
@ -150,6 +185,44 @@ color: rgb(255, 255, 255);</string>
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="label_right">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>0</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>16777215</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(0, 0, 0, 0);
color: rgb(211, 215, 207);</string>
</property>
<property name="text">
<string/>
</property>
<property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="devlabel_left"> <widget class="QLabel" name="devlabel_left">
<property name="font"> <property name="font">
@ -442,61 +515,45 @@ outline: none;</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> <item>
</widget> <widget class="QLabel" name="Digital_clock">
</item> <property name="sizePolicy">
<item> <sizepolicy hsizetype="Fixed" vsizetype="Preferred">
<spacer name="horizontalSpacer_12"> <horstretch>0</horstretch>
<property name="orientation"> <verstretch>0</verstretch>
<enum>Qt::Horizontal</enum> </sizepolicy>
</property> </property>
<property name="sizeType"> <property name="minimumSize">
<enum>QSizePolicy::Fixed</enum> <size>
</property> <width>100</width>
<property name="sizeHint" stdset="0"> <height>22</height>
<size> </size>
<width>10</width> </property>
<height>20</height> <property name="maximumSize">
</size> <size>
</property> <width>100</width>
</spacer> <height>22</height>
</item> </size>
<item> </property>
<widget class="QLabel" name="Digital_clock"> <property name="font">
<property name="sizePolicy"> <font>
<sizepolicy hsizetype="Fixed" vsizetype="Preferred"> <weight>75</weight>
<horstretch>0</horstretch> <bold>true</bold>
<verstretch>0</verstretch> </font>
</sizepolicy> </property>
</property> <property name="styleSheet">
<property name="minimumSize"> <string notr="true">background-color: rgba(255, 255, 255, 0);
<size>
<width>0</width>
<height>22</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>22</height>
</size>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(255, 255, 255, 0);
color: rgb(255, 255, 255);</string> color: rgb(255, 255, 255);</string>
</property> </property>
<property name="text"> <property name="text">
<string>12:00:00</string> <string>12:00:00</string>
</property> </property>
<property name="alignment"> <property name="alignment">
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set> <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
</property> </property>
</widget>
</item>
</layout>
</widget> </widget>
</item> </item>
</layout> </layout>
@ -556,6 +613,34 @@ color: rgb(255, 255, 255);</string>
</property> </property>
<item row="0" column="0" colspan="2"> <item row="0" column="0" colspan="2">
<layout class="QHBoxLayout" name="Layout_Sliderselect"> <layout class="QHBoxLayout" name="Layout_Sliderselect">
<item>
<widget class="QPushButton" name="pushButtonAndroidAuto">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="font">
<font>
<weight>75</weight>
<bold>true</bold>
</font>
</property>
<property name="styleSheet">
<string notr="true">background-color: rgba(14, 8, 137, 0.5);
color: rgb(255, 255, 255);
border-radius: 4px;
border: 2px solid rgba(255,255,255,0.5);
outline: none;
</string>
</property>
<property name="text">
<string>Android
Auto</string>
</property>
</widget>
</item>
<item> <item>
<widget class="QPushButton" name="pushButtonDay"> <widget class="QPushButton" name="pushButtonDay">
<property name="sizePolicy"> <property name="sizePolicy">

331
src/autoapp/UI/settingswindow.ui
View File

@ -408,47 +408,6 @@ outline: none;
</item> </item>
</layout> </layout>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBoxMediaPlayer">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Media player defaults</string>
</property>
<layout class="QFormLayout" name="formLayout_5">
<property name="topMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxAutoPlay">
<property name="text">
<string>auto play</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_AutoPlay">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Auto playback last played song on startup if available</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QGroupBox" name="groupBoxAlpha"> <widget class="QGroupBox" name="groupBoxAlpha">
<property name="sizePolicy"> <property name="sizePolicy">
@ -521,6 +480,47 @@ QSlider::groove:horizontal { background: #6d6d6d; height: 32px;}</string>
</layout> </layout>
</widget> </widget>
</item> </item>
<item>
<widget class="QGroupBox" name="groupBoxMediaPlayer">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="title">
<string>Media player defaults</string>
</property>
<layout class="QFormLayout" name="formLayout_5">
<property name="topMargin">
<number>2</number>
</property>
<property name="bottomMargin">
<number>2</number>
</property>
<item row="0" column="0">
<widget class="QCheckBox" name="checkBoxAutoPlay">
<property name="text">
<string>auto play</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QLabel" name="label_AutoPlay">
<property name="sizePolicy">
<sizepolicy hsizetype="Expanding" vsizetype="Preferred">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text">
<string>Auto playback last played song on startup if available</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item> <item>
<widget class="QLabel" name="autofill_space_tab1"> <widget class="QLabel" name="autofill_space_tab1">
<property name="sizePolicy"> <property name="sizePolicy">
@ -4922,6 +4922,255 @@ subcontrol-position: center left;
</item> </item>
</layout> </layout>
</item> </item>
<item>
<layout class="QFormLayout" name="daynightpin">
<item row="0" column="0">
<widget class="QLabel" name="label_16">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="text">
<string>DayNight-Pin</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBoxDayNight">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>16777215</width>
<height>32</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QScrollBar {
width: 40px;
background-color: rgba(85, 87, 83, 0.7);
}</string>
</property>
<item>
<property name="text">
<string>- - -</string>
</property>
</item>
<item>
<property name="text">
<string>1</string>
</property>
</item>
<item>
<property name="text">
<string>2</string>
</property>
</item>
<item>
<property name="text">
<string>3</string>
</property>
</item>
<item>
<property name="text">
<string>4</string>
</property>
</item>
<item>
<property name="text">
<string>5</string>
</property>
</item>
<item>
<property name="text">
<string>6</string>
</property>
</item>
<item>
<property name="text">
<string>7</string>
</property>
</item>
<item>
<property name="text">
<string>8</string>
</property>
</item>
<item>
<property name="text">
<string>9</string>
</property>
</item>
<item>
<property name="text">
<string>10</string>
</property>
</item>
<item>
<property name="text">
<string>11</string>
</property>
</item>
<item>
<property name="text">
<string>12</string>
</property>
</item>
<item>
<property name="text">
<string>13</string>
</property>
</item>
<item>
<property name="text">
<string>14</string>
</property>
</item>
<item>
<property name="text">
<string>15</string>
</property>
</item>
<item>
<property name="text">
<string>16</string>
</property>
</item>
<item>
<property name="text">
<string>17</string>
</property>
</item>
<item>
<property name="text">
<string>18</string>
</property>
</item>
<item>
<property name="text">
<string>19</string>
</property>
</item>
<item>
<property name="text">
<string>20</string>
</property>
</item>
<item>
<property name="text">
<string>21</string>
</property>
</item>
<item>
<property name="text">
<string>22</string>
</property>
</item>
<item>
<property name="text">
<string>23</string>
</property>
</item>
<item>
<property name="text">
<string>24</string>
</property>
</item>
<item>
<property name="text">
<string>25</string>
</property>
</item>
<item>
<property name="text">
<string>26</string>
</property>
</item>
</widget>
</item>
</layout>
</item>
<item>
<layout class="QFormLayout" name="formLayout_6">
<item row="0" column="0">
<widget class="QLabel" name="label_17">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="text">
<string>Unused</string>
</property>
</widget>
</item>
<item row="0" column="1">
<widget class="QComboBox" name="comboBox">
<property name="sizePolicy">
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="minimumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="maximumSize">
<size>
<width>100</width>
<height>32</height>
</size>
</property>
<property name="styleSheet">
<string notr="true">QScrollBar {
width: 40px;
background-color: rgba(85, 87, 83, 0.7);
}</string>
</property>
</widget>
</item>
</layout>
</item>
</layout> </layout>
</item> </item>
</layout> </layout>

8
src/autoapp/autoapp.cpp
View File

@ -229,6 +229,14 @@ int main(int argc, char* argv[])
app->start(std::move(socket)); app->start(std::move(socket));
}); });
//QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerAAStart, [&qApplication]() {
// OPENAUTO_LOG(info) << "[CS] Manual start android auto entity.";
//});
//QObject::connect(&mainWindow, &autoapp::ui::MainWindow::TriggerAAStop, [&qApplication]() {
// OPENAUTO_LOG(info) << "[CS] Manual stop android auto entity.";
//});
app->waitForUSBDevice(); app->waitForUSBDevice();
auto result = qApplication.exec(); auto result = qApplication.exec();