From f9baeaf1513399236967a04a838f45ea6f9d0920 Mon Sep 17 00:00:00 2001 From: Cristian Luis Duarte Date: Mon, 16 Jul 2018 12:28:44 -0300 Subject: [PATCH] Android - logs during startup - weirdly did not get stuck during tests --- .../hifiinterface/InterfaceActivity.java | 3 +++ .../hifiinterface/SplashActivity.java | 5 +++++ interface/src/Application.cpp | 15 ++++++++------- 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java index 8fd8b9d0e6..90db3fe47f 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java @@ -83,6 +83,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW @Override public void onCreate(Bundle savedInstanceState) { + Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Interface Activity"); super.isLoading = true; Intent intent = getIntent(); if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) { @@ -128,6 +129,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW getActionBar().hide(); } }); + Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Loading Screen"); startActivity(new Intent(this, SplashActivity.class)); mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE); @@ -149,6 +151,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL); qtLayout.addView(webSlidingDrawer, layoutParams); webSlidingDrawer.setVisibility(View.GONE); + Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate done"); } @Override diff --git a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java index e0aa967aaa..cd12487688 100644 --- a/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java +++ b/android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java @@ -1,9 +1,11 @@ package io.highfidelity.hifiinterface; import android.app.Activity; +import android.app.Application; import android.content.Intent; import android.os.Bundle; import android.os.Handler; +import android.util.Log; import android.view.View; public class SplashActivity extends Activity { @@ -12,9 +14,11 @@ public class SplashActivity extends Activity { @Override protected void onCreate(Bundle savedInstanceState) { + Log.d("[LOADSTUCK]", "SplashActivity::onCreate Creating loading screen"); super.onCreate(savedInstanceState); setContentView(R.layout.activity_splash); registerLoadCompleteListener(); + Log.d("[LOADSTUCK]", "SplashActivity::onCreate registered as loaded listener"); } @Override @@ -37,6 +41,7 @@ public class SplashActivity extends Activity { } public void onAppLoadedComplete() { + Log.d("[LOADSTUCK]", "SplashActivity::onAppLoadedComplete received"); startActivity(new Intent(this, MainActivity.class)); SplashActivity.this.finish(); } diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 311c08b858..55265dcfeb 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1003,7 +1003,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo _sampleSound(nullptr) { - + qDebug() << "[LOADSTUCK] Application::Application started constructor"; auto steamClient = PluginManager::getInstance()->getSteamClientPlugin(); setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::CRASHED, _previousSessionCrashed); @@ -1643,7 +1643,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo } } }); - + qDebug() << "[LOADSTUCK] Application::Application 20 user input mapper stuff done"; _applicationStateDevice = userInputMapper->getStateDevice(); _applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float { @@ -1711,7 +1711,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo updateHeartbeat(); loadSettings(); - + qDebug() << "[LOADSTUCK] Application::Application 30 settings loaded"; updateVerboseLogging(); // Now that we've loaded the menu and thus switched to the previous display plugin @@ -1763,7 +1763,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived); this->installEventFilter(this); - + qDebug() << "[LOADSTUCK] Application::Application 40 event filter installed"; #ifdef HAVE_DDE auto ddeTracker = DependencyManager::get(); ddeTracker->init(); @@ -1897,7 +1897,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo } return false; }); - + qDebug() << "[LOADSTUCK] Application::Application 50 entity tree stuff done"; // Keyboard focus handling for Web overlays. auto overlays = &(qApp->getOverlays()); connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) { @@ -2156,7 +2156,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo // Make sure we don't time out during slow operations at startup updateHeartbeat(); - + qDebug() << "[LOADSTUCK] Application::Application 60 heartbeat updated"; OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender(); EntityEditPacketSender* entityPacketSender = static_cast(packetSender); entityPacketSender->setMyAvatar(myAvatar.get()); @@ -2217,7 +2217,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo updateSystemTabletMode(); connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged); - + qDebug() << "[LOADSTUCK] Application::Application 70 camera mode changed connected"; DependencyManager::get()->setShouldPickHUDOperator([&]() { return DependencyManager::get()->isHMDMode(); }); DependencyManager::get()->setCalculatePos2DFromHUDOperator([&](const glm::vec3& intersection) { const glm::vec2 MARGIN(25.0f); @@ -2261,6 +2261,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground); + qDebug() << "[LOADSTUCK] Application::Application before calling notifyLoadComplete()"; AndroidHelper::instance().notifyLoadComplete(); #endif }