Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:47:30 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Android - Freeze at startup problem - remove logs

Browse source
This commit is contained in:
Cristian Luis Duarte 2018-07-19 20:47:05 -03:00
parent 19146ef73c
commit 6d239f40fb
3 changed files with 0 additions and 14 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,7 +83,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
@Override @Override
public void onCreate(Bundle savedInstanceState) { public void onCreate(Bundle savedInstanceState) {
Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Interface Activity");
super.isLoading = true; super.isLoading = true;
Intent intent = getIntent(); Intent intent = getIntent();
if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) { if (intent.hasExtra(DOMAIN_URL) && !intent.getStringExtra(DOMAIN_URL).isEmpty()) {
@ -129,7 +128,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
getActionBar().hide(); getActionBar().hide();
} }
}); });
Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate starting Loading Screen");
startActivity(new Intent(this, SplashActivity.class)); startActivity(new Intent(this, SplashActivity.class));
mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE); mVibrator = (Vibrator) this.getSystemService(VIBRATOR_SERVICE);
@ -151,7 +149,6 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL); layoutParams.resolveLayoutDirection(View.LAYOUT_DIRECTION_RTL);
qtLayout.addView(webSlidingDrawer, layoutParams); qtLayout.addView(webSlidingDrawer, layoutParams);
webSlidingDrawer.setVisibility(View.GONE); webSlidingDrawer.setVisibility(View.GONE);
Log.d("[LOADSTUCK]", "InterfaceActivity::onCreate done");
} }
@Override @Override

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

@ -14,11 +14,9 @@ public class SplashActivity extends Activity {
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
Log.d("[LOADSTUCK]", "SplashActivity::onCreate Creating loading screen");
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_splash); setContentView(R.layout.activity_splash);
registerLoadCompleteListener(); registerLoadCompleteListener();
Log.d("[LOADSTUCK]", "SplashActivity::onCreate registered as loaded listener");
} }
@Override @Override
@ -41,7 +39,6 @@ public class SplashActivity extends Activity {
} }
public void onAppLoadedComplete() { public void onAppLoadedComplete() {
Log.d("[LOADSTUCK]", "SplashActivity::onAppLoadedComplete received");
startActivity(new Intent(this, MainActivity.class)); startActivity(new Intent(this, MainActivity.class));
SplashActivity.this.finish(); SplashActivity.this.finish();
} }

8
interface/src/Application.cpp
View file

@ -1003,7 +1003,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
_sampleSound(nullptr) _sampleSound(nullptr)
{ {
qDebug() << "[LOADSTUCK] Application::Application started constructor";
auto steamClient = PluginManager::getInstance()->getSteamClientPlugin(); auto steamClient = PluginManager::getInstance()->getSteamClientPlugin();
setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning())); setProperty(hifi::properties::STEAM, (steamClient && steamClient->isRunning()));
setProperty(hifi::properties::CRASHED, _previousSessionCrashed); setProperty(hifi::properties::CRASHED, _previousSessionCrashed);
@ -1643,7 +1642,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} }
} }
}); });
qDebug() << "[LOADSTUCK] Application::Application 20 user input mapper stuff done";
_applicationStateDevice = userInputMapper->getStateDevice(); _applicationStateDevice = userInputMapper->getStateDevice();
_applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float { _applicationStateDevice->setInputVariant(STATE_IN_HMD, []() -> float {
@ -1711,7 +1709,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
updateHeartbeat(); updateHeartbeat();
loadSettings(); loadSettings();
qDebug() << "[LOADSTUCK] Application::Application 30 settings loaded";
updateVerboseLogging(); updateVerboseLogging();
// Now that we've loaded the menu and thus switched to the previous display plugin // Now that we've loaded the menu and thus switched to the previous display plugin
@ -1763,7 +1760,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived); connect(audioIO.data(), &AudioClient::inputReceived, audioScriptingInterface.data(), &AudioScriptingInterface::inputReceived);
this->installEventFilter(this); this->installEventFilter(this);
qDebug() << "[LOADSTUCK] Application::Application 40 event filter installed";
#ifdef HAVE_DDE #ifdef HAVE_DDE
auto ddeTracker = DependencyManager::get<DdeFaceTracker>(); auto ddeTracker = DependencyManager::get<DdeFaceTracker>();
ddeTracker->init(); ddeTracker->init();
@ -1897,7 +1893,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
} }
return false; return false;
}); });
qDebug() << "[LOADSTUCK] Application::Application 50 entity tree stuff done";
// Keyboard focus handling for Web overlays. // Keyboard focus handling for Web overlays.
auto overlays = &(qApp->getOverlays()); auto overlays = &(qApp->getOverlays());
connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) { connect(overlays, &Overlays::overlayDeleted, [=](const OverlayID& overlayID) {
@ -2156,7 +2151,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
// Make sure we don't time out during slow operations at startup // Make sure we don't time out during slow operations at startup
updateHeartbeat(); updateHeartbeat();
qDebug() << "[LOADSTUCK] Application::Application 60 heartbeat updated";
OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender(); OctreeEditPacketSender* packetSender = entityScriptingInterface->getPacketSender();
EntityEditPacketSender* entityPacketSender = static_cast<EntityEditPacketSender*>(packetSender); EntityEditPacketSender* entityPacketSender = static_cast<EntityEditPacketSender*>(packetSender);
entityPacketSender->setMyAvatar(myAvatar.get()); entityPacketSender->setMyAvatar(myAvatar.get());
@ -2217,7 +2211,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
updateSystemTabletMode(); updateSystemTabletMode();
connect(&_myCamera, &Camera::modeUpdated, this, &Application::cameraModeChanged); 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>()->setShouldPickHUDOperator([&]() { return DependencyManager::get<HMDScriptingInterface>()->isHMDMode(); });
DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([&](const glm::vec3& intersection) { DependencyManager::get<PickManager>()->setCalculatePos2DFromHUDOperator([&](const glm::vec3& intersection) {
const glm::vec2 MARGIN(25.0f); const glm::vec2 MARGIN(25.0f);
@ -2261,7 +2254,6 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo
connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::beforeEnterBackground, this, &Application::beforeEnterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground); connect(&AndroidHelper::instance(), &AndroidHelper::enterBackground, this, &Application::enterBackground);
connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground); connect(&AndroidHelper::instance(), &AndroidHelper::enterForeground, this, &Application::enterForeground);
qDebug() << "[LOADSTUCK] Application::Application before calling notifyLoadComplete()";
AndroidHelper::instance().notifyLoadComplete(); AndroidHelper::instance().notifyLoadComplete();
#endif #endif
} }