Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 10:37:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep the domain connection while WebView is expanded

Browse source
This commit is contained in:
Gabriel Calero 2018-07-04 16:10:54 -03:00
parent 05267a7100
commit 9675328f1e
4 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -24,10 +24,8 @@ import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.os.Vibrator; import android.os.Vibrator;
import android.util.Log; import android.util.Log;
import android.view.Display;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup;
import android.view.WindowManager; import android.view.WindowManager;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.SlidingDrawer; import android.widget.SlidingDrawer;
@ -173,6 +171,7 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
super.onResume(); super.onResume();
nativeEnterForeground(); nativeEnterForeground();
surfacesWorkaround(); surfacesWorkaround();
keepInterfaceRunning = false;
//gvrApi.resumeTracking(); //gvrApi.resumeTracking();
} }
@ -337,4 +336,9 @@ public class InterfaceActivity extends QtActivity implements WebViewFragment.OnW
@Override @Override
public void onTitleReceived(String title) { } public void onTitleReceived(String title) { }
@Override
public void onExpand() {
keepInterfaceRunning = true;
}
} }

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

@ -128,4 +128,7 @@ public class WebViewActivity extends Activity implements WebViewFragment.OnWebVi
mActionBar.setTitle(title); mActionBar.setTitle(title);
} }
@Override
public void onExpand() { }
} }

11
android/app/src/main/java/io/highfidelity/hifiinterface/fragment/WebViewFragment.java
View file

@ -14,7 +14,6 @@ import android.view.MotionEvent;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.view.animation.AlphaAnimation; import android.view.animation.AlphaAnimation;
import android.view.animation.Animation;
import android.webkit.SslErrorHandler; import android.webkit.SslErrorHandler;
import android.webkit.WebChromeClient; import android.webkit.WebChromeClient;
import android.webkit.WebResourceError; import android.webkit.WebResourceError;
@ -183,7 +182,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
@Override @Override
public boolean onDoubleTap(MotionEvent motionEvent) { public boolean onDoubleTap(MotionEvent motionEvent) {
openInFullScreen(); expand();
return false; return false;
} }
@ -203,7 +202,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
mToolbar = rootView.findViewById(R.id.toolbar); mToolbar = rootView.findViewById(R.id.toolbar);
mToolbar.findViewById(R.id.viewFullScreen).setOnClickListener(view -> { mToolbar.findViewById(R.id.viewFullScreen).setOnClickListener(view -> {
openInFullScreen(); expand();
}); });
mToolbar.findViewById(R.id.close).setOnClickListener(view -> { mToolbar.findViewById(R.id.close).setOnClickListener(view -> {
if (mCloseAction != null) { if (mCloseAction != null) {
@ -216,7 +215,10 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
return rootView; return rootView;
} }
private void openInFullScreen() { private void expand() {
if (mListener != null) {
mListener.onExpand();
}
Intent intent = new Intent(getActivity(), WebViewActivity.class); Intent intent = new Intent(getActivity(), WebViewActivity.class);
intent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, intentUrlOrWebUrl()); intent.putExtra(WebViewActivity.WEB_VIEW_ACTIVITY_EXTRA_URL, intentUrlOrWebUrl());
getActivity().startActivity(intent); getActivity().startActivity(intent);
@ -243,6 +245,7 @@ public class WebViewFragment extends Fragment implements GestureDetector.OnGestu
void processURL(String url); void processURL(String url);
void onWebLoaded(String url, SafenessLevel safenessLevel); void onWebLoaded(String url, SafenessLevel safenessLevel);
void onTitleReceived(String title); void onTitleReceived(String title);
void onExpand();
} }

7
android/app/src/main/java/org/qtproject/qt5/android/bindings/QtActivity.java
View file

@ -69,6 +69,7 @@ public class QtActivity extends Activity {
private QtActivityLoader m_loader = new QtActivityLoader(this); private QtActivityLoader m_loader = new QtActivityLoader(this);
public boolean isLoading; public boolean isLoading;
public boolean keepInterfaceRunning;
public QtActivity() { public QtActivity() {
} }
@ -503,7 +504,7 @@ public class QtActivity extends Activity {
super.onPause(); super.onPause();
// GC: this trick allow us to show a splash activity until Qt app finishes // GC: this trick allow us to show a splash activity until Qt app finishes
// loading // loading
if (!isLoading) { if (!isLoading && !keepInterfaceRunning) {
QtApplication.invokeDelegate(); QtApplication.invokeDelegate();
} }
} }
@ -644,7 +645,9 @@ public class QtActivity extends Activity {
@Override @Override
protected void onStop() { protected void onStop() {
super.onStop(); super.onStop();
QtApplication.invokeDelegate(); if (!keepInterfaceRunning) {
QtApplication.invokeDelegate();
}
} }
//--------------------------------------------------------------------------- //---------------------------------------------------------------------------