Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-10 04:52:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Android - logs during startup - weirdly did not get stuck during tests

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-07-16 12:28:44 -03:00
parent 8669b529dc
commit f9baeaf151
3 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
android/app/src/main/java/io/highfidelity/hifiinterface/InterfaceActivity.java
View file

@ -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

5
android/app/src/main/java/io/highfidelity/hifiinterface/SplashActivity.java
View file

@ -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();
}

15
interface/src/Application.cpp
View file

@ -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<DdeFaceTracker>();
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<EntityEditPacketSender*>(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<PickManager>()->setShouldPickHUDOperator([&]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
DependencyManager::get<PickManager>()->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
}