From 849cc91da8cf1df1ba95bc0579833d414ffc3d27 Mon Sep 17 00:00:00 2001 From: Jan-Martin Raemer Date: Sun, 12 Nov 2023 15:47:16 +0100 Subject: [PATCH] mayas piggy version --- LenaPi/EnergySaver.cpp | 2 +- LenaPi/LenaPi.pro.user | 88 +++++--------------- LenaPi/android-files/AndroidManifest.xml | 2 +- LenaPi/controllers/NavigationController.cpp | 1 - LenaPi/controllers/SettingsHandler.cpp | 6 ++ LenaPi/controllers/SettingsHandler.h | 1 + LenaPi/lenapi.qrc | 1 + LenaPi/main.qml | 1 + LenaPi/models/UiStateModel.cpp | 1 + LenaPi/resources/pig.png | Bin 0 -> 6019 bytes 10 files changed, 31 insertions(+), 72 deletions(-) create mode 100644 LenaPi/resources/pig.png diff --git a/LenaPi/EnergySaver.cpp b/LenaPi/EnergySaver.cpp index da9db13..3d3c394 100644 --- a/LenaPi/EnergySaver.cpp +++ b/LenaPi/EnergySaver.cpp @@ -97,7 +97,7 @@ void EnergySaver::initAdroidLocks() QAndroidJniObject powerMgr = activity.callObjectMethod("getSystemService", "(Ljava/lang/String;)Ljava/lang/Object;",serviceName.object()); if ( powerMgr.isValid() ) { - jint levelAndFlags = QAndroidJniObject::getStaticField("android/os/PowerManager","SCREEN_DIM_WAKE_LOCK"); + jint levelAndFlags = QAndroidJniObject::getStaticField("android/os/PowerManager","PARTIAL_WAKE_LOCK"); QAndroidJniObject tag = QAndroidJniObject::fromString( "My Tag" ); diff --git a/LenaPi/LenaPi.pro.user b/LenaPi/LenaPi.pro.user index 73f8196..0c73fd4 100644 --- a/LenaPi/LenaPi.pro.user +++ b/LenaPi/LenaPi.pro.user @@ -1,6 +1,6 @@ - + EnvironmentId @@ -54,6 +54,7 @@ *.md, *.MD, Makefile false true + true @@ -219,18 +220,6 @@ - true - RemoteLinux.CheckForFreeDiskSpaceStep - - - - - / - 5242880 - - - - true RemoteLinux.KillAppStep @@ -240,7 +229,7 @@ - + true RemoteLinux.RsyncDeployStep @@ -251,7 +240,7 @@ -av - 3 + 2 Deploy Deploy ProjectExplorer.BuildSteps.Deploy @@ -263,62 +252,21 @@ 1 + dwarf + + cpu-cycles + + -F true + 0 true true - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - - - 2 - - ProjectExplorer.CustomExecutableRunConfiguration - - false - true - false - true - - - true - true - true - - 0 - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 1 - RemoteLinux.CustomRunConfig - + LenaPi (on %{Device:Name}) + RemoteLinuxRunConfiguration:/home/jmr/privat/src/LenaPi/LenaPi/LenaPi.pro + /home/jmr/privat/src/LenaPi/LenaPi/LenaPi.pro 1 false true @@ -326,7 +274,7 @@ true :0.0 - 2 + 1 @@ -532,8 +480,8 @@ armeabi-v7a armeabi - 58009fc2 - 28 + A209G5H30201 + 30 dwarf @@ -542,6 +490,7 @@ -F true + 0 true true @@ -570,7 +519,7 @@ desktop desktop {73308c85-3272-4fe8-8c9f-0eb72285644f} - 1 + 0 0 0 @@ -717,6 +666,7 @@ -F true + 0 true true diff --git a/LenaPi/android-files/AndroidManifest.xml b/LenaPi/android-files/AndroidManifest.xml index e0c143a..55385f3 100644 --- a/LenaPi/android-files/AndroidManifest.xml +++ b/LenaPi/android-files/AndroidManifest.xml @@ -60,7 +60,7 @@ application still try to draw after "applicationStateChanged(Qt::ApplicationSuspended)" signal is sent! --> - + diff --git a/LenaPi/controllers/NavigationController.cpp b/LenaPi/controllers/NavigationController.cpp index f3bb4ab..684bf94 100644 --- a/LenaPi/controllers/NavigationController.cpp +++ b/LenaPi/controllers/NavigationController.cpp @@ -36,7 +36,6 @@ void NavigationController::init(const QString &rootPath) auto rootDir = QDir(rootPath); if(!rootDir.exists()) return; mRootPath = rootPath; - add(mRootPath, mRootItem); mNavList->setModelItems(mRootItem->getChildren()); diff --git a/LenaPi/controllers/SettingsHandler.cpp b/LenaPi/controllers/SettingsHandler.cpp index a0f6edb..302134f 100644 --- a/LenaPi/controllers/SettingsHandler.cpp +++ b/LenaPi/controllers/SettingsHandler.cpp @@ -60,7 +60,13 @@ QString SettingsHandler::getShutdownScript() const void SettingsHandler::initDefaults() { +#ifdef ANDROID + // three out of four devices report '4' as QStandardPaths::MusicLocation + //mDefaults.insert(rootPath, "/storage/self/primary/Music"); + mDefaults.insert(rootPath, QStandardPaths::writableLocation(QStandardPaths::MusicLocation)); +#else mDefaults.insert(rootPath, QStandardPaths::MusicLocation); +#endif mDefaults.insert(enableEnergySaver, false); mDefaults.insert(timeout, 60); mDefaults.insert(shutdownScript, "/usr/local/sbin/do_shutdown.sh"); diff --git a/LenaPi/controllers/SettingsHandler.h b/LenaPi/controllers/SettingsHandler.h index 2b7cb8d..5c80603 100644 --- a/LenaPi/controllers/SettingsHandler.h +++ b/LenaPi/controllers/SettingsHandler.h @@ -31,6 +31,7 @@ public: QString getProfile() const; bool isEnergySaverEnabled() const; int getEnergySaverTimeout() const; + bool isVolumeControlsVisible() const; QString getShutdownScript() const; diff --git a/LenaPi/lenapi.qrc b/LenaPi/lenapi.qrc index 2a3ca97..f126528 100644 --- a/LenaPi/lenapi.qrc +++ b/LenaPi/lenapi.qrc @@ -11,5 +11,6 @@ resources/close.png resources/speaker_high_volume.png resources/speaker_low_volume.png + resources/pig.png diff --git a/LenaPi/main.qml b/LenaPi/main.qml index c796e43..7f8c018 100644 --- a/LenaPi/main.qml +++ b/LenaPi/main.qml @@ -15,6 +15,7 @@ Window { anchors.fill: parent z: -1 + //source: "qrc:/resources/pig.png" source: "qrc:/background" } diff --git a/LenaPi/models/UiStateModel.cpp b/LenaPi/models/UiStateModel.cpp index 98062ff..3d1ff7e 100644 --- a/LenaPi/models/UiStateModel.cpp +++ b/LenaPi/models/UiStateModel.cpp @@ -21,6 +21,7 @@ bool UiStateModel::isShowQuitAppButton() const bool UiStateModel::isShowVolumeControls() const { +// return true; //comment in as workaround for maya pi const auto & profileInfo = mProfileInfoMap[mProfile]; return profileInfo.isShowVolumeControls; } diff --git a/LenaPi/resources/pig.png b/LenaPi/resources/pig.png new file mode 100644 index 0000000000000000000000000000000000000000..eee00bf014511b8569483df84d0682b89e50e518 GIT binary patch literal 6019 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 literal 0 HcmV?d00001