Browse Source

Merge branch 'develop' of https://github.com/swict/LifePlusAndroid into develop

Hasemi 7 years ago
parent
commit
62402c9e14

+ 86 - 0
app/src/main/java/kr/co/zumo/app/lifeplus/view/custom/VideoWebChromeClient.java

@@ -0,0 +1,86 @@
+/*
+ * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
+ */
+package kr.co.zumo.app.lifeplus.view.custom;
+
+import android.app.Activity;
+import android.support.annotation.CallSuper;
+import android.util.Log;
+import android.view.View;
+import android.webkit.WebChromeClient;
+import android.widget.FrameLayout;
+
+import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.util.ResourceUtil;
+
+/**
+ * VideoWebChromeClient
+ * <pre>
+ * </pre>
+ *
+ * @author 민효동
+ * @version 1.0
+ * @history 민효동   [2018. 12. 18.]   [최초 작성]
+ * @since 2018. 12. 18.
+ */
+public class VideoWebChromeClient extends WebChromeClient {
+
+  protected Activity activity;
+  private boolean isShowFullScreenVideo;
+  private View videoView = null;
+  private FrameLayout container;
+  private FrameLayout customViewContainerBack;
+  private FrameLayout customViewContainer;
+
+  public VideoWebChromeClient(Activity activity) {
+    this.activity = activity;
+
+    customViewContainer = activity.findViewById(android.R.id.content);
+
+  }
+
+  @CallSuper
+  @Override
+  public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) {
+    Log.i("APP# VideoWebChromeClient | onShowCustomView", "|" + "-------------------------------------------------------> onShowCustomView");
+    super.onShowCustomView(view, callback);
+
+    videoView = view;
+    videoView.requestFocus();
+
+    customViewContainerBack = new FrameLayout(activity);
+    customViewContainerBack.setBackgroundColor(ResourceUtil.getColor(R.color.C000000));
+    customViewContainerBack.setVisibility(View.VISIBLE);
+    customViewContainer.addView(customViewContainerBack, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.MATCH_PARENT));
+
+    container = new FrameLayout(activity);
+    container.addView(videoView, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT));
+    customViewContainer.addView(container, new FrameLayout.LayoutParams(FrameLayout.LayoutParams.WRAP_CONTENT, FrameLayout.LayoutParams.WRAP_CONTENT));
+
+    isShowFullScreenVideo = true;
+  }
+
+  @CallSuper
+  @Override
+  public void onHideCustomView() {
+    Log.i("APP# VideoWebChromeClient | onHideCustomView", "|" + "------------------------------------------------------->");
+    super.onHideCustomView();
+
+    if (null != videoView) {
+      container.removeView(videoView);
+      customViewContainer.removeView(videoView);
+      videoView = null;
+      container = null;
+    }
+    if (null != customViewContainerBack) {
+      customViewContainer.removeView(customViewContainerBack);
+      customViewContainerBack = null;
+    }
+
+    isShowFullScreenVideo = false;
+  }
+
+  public boolean isShowFullScreenVideo() {
+    return isShowFullScreenVideo;
+  }
+}

+ 24 - 47
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/ContentsHtmlHolder.java

@@ -11,7 +11,6 @@ import android.webkit.SslErrorHandler;
 import android.webkit.WebSettings;
 import android.webkit.WebView;
 import android.webkit.WebViewClient;
-import android.widget.FrameLayout;
 
 import com.google.gson.Gson;
 
@@ -22,6 +21,7 @@ import kr.co.zumo.app.lifeplus.util.StringUtil;
 import kr.co.zumo.app.lifeplus.view.Event;
 import kr.co.zumo.app.lifeplus.view.Visibler;
 import kr.co.zumo.app.lifeplus.view.WebConstant;
+import kr.co.zumo.app.lifeplus.view.custom.VideoWebChromeClient;
 
 /**
  * ContentsHtmlHolder
@@ -35,13 +35,11 @@ import kr.co.zumo.app.lifeplus.view.WebConstant;
  */
 public class ContentsHtmlHolder extends ContentsHolder<ContentsDetailBean> {
 
-  //  private VideoEnabledWebView webView;
-//  private VideoEnabledWebChromeClient webChromeClient;
   private WebView webView;
   protected ConstraintLayout layoutMoreInfo;
   protected View dim0;
   protected View dim1;
-  private boolean isShowFullScreenVideo;
+  private VideoWebChromeClient webChromeClient;
 
   public ContentsHtmlHolder(View itemView) {
     super(itemView);
@@ -81,44 +79,21 @@ public class ContentsHtmlHolder extends ContentsHolder<ContentsDetailBean> {
         }
       });
 
-      FrameLayout customViewContainer = itemView.findViewById(R.id.layout_full_screen);
-      FrameLayout customViewContainerBack = itemView.findViewById(R.id.layout_full_screen_background);
-//      FrameLayout customViewContainer = activity.findViewById(android.R.id.content);
-
-      // fixme 일부 기기에서 실행되지 않아서 제거(임시)
-//      webView.setWebChromeClient(new WebChromeClient() {
-//
-//        public void onShowCustomView(View view, WebChromeClient.CustomViewCallback callback) {
-//          super.onShowCustomView(view, callback);
-//          webView.setVisibility(View.GONE);
-//          customViewContainerBack.setVisibility(View.VISIBLE);
-//          customViewContainer.setVisibility(View.VISIBLE);
-//          customViewContainer.addView(view);
-//          view.setBackground(null);
-//          isShowFullScreenVideo = true;
-//        }
-//
-//        public void onHideCustomView() {
-//          super.onHideCustomView();
-//          webView.setVisibility(View.VISIBLE);
-//          customViewContainerBack.setVisibility(View.GONE);
-//          customViewContainer.setVisibility(View.GONE);
-//          isShowFullScreenVideo = false;
-//        }
-//      });
-
-//      webChromeClient = new VideoEnabledWebChromeClient(webView, customViewContainer) {
-//        @Override
-//        public void onShowCustomView(View view, CustomViewCallback callback) {
-//          super.onShowCustomView(view, callback);
-//        }
-//
-//        @Override
-//        public void onHideCustomView() {
-//          super.onHideCustomView();
-//        }
-//      };
-//      webView.setWebChromeClient(webChromeClient);
+      webChromeClient = new VideoWebChromeClient(activity) {
+        @Override
+        public void onShowCustomView(View view, CustomViewCallback callback) {
+          super.onShowCustomView(view, callback);
+          webView.setVisibility(View.GONE);
+        }
+
+        @Override
+        public void onHideCustomView() {
+          super.onHideCustomView();
+          webView.setVisibility(View.VISIBLE);
+        }
+      };
+
+      webView.setWebChromeClient(webChromeClient);
 
       init(webView);
 
@@ -126,7 +101,7 @@ public class ContentsHtmlHolder extends ContentsHolder<ContentsDetailBean> {
 
       webView.loadUrl(url);
     }
-    
+
     layoutMoreInfo.setVisibility(View.GONE);
   }
 
@@ -177,10 +152,12 @@ public class ContentsHtmlHolder extends ContentsHolder<ContentsDetailBean> {
 
   @Override
   public boolean dispatchBackPressed() {
-//    // 풀 스크린 닫기
-//    if (webChromeClient.onBackPressed()) {
-//      return true;
-//    }
+    // 풀 스크린 닫기
+    if (webChromeClient.isShowFullScreenVideo()) {
+      webView.goBack();
+//      webChromeClient.onHideCustomView();
+      return true;
+    }
     return false;
   }
 

+ 0 - 264
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/VideoEnabledWebChromeClient.java

@@ -1,264 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.contents;
-
-/**
- * VideoEnabledWebChromeClient
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 12. 16.]   [최초 작성]
- * @since 2018. 12. 16.
- */
-
-import android.media.MediaPlayer;
-import android.media.MediaPlayer.OnCompletionListener;
-import android.media.MediaPlayer.OnErrorListener;
-import android.media.MediaPlayer.OnPreparedListener;
-import android.view.View;
-import android.view.ViewGroup;
-import android.webkit.WebChromeClient;
-import android.widget.FrameLayout;
-import android.widget.VideoView;
-
-/**
- * This class serves as a WebChromeClient to be set to a WebView, allowing it to play video.
- * It works with old VideoView-s as well as the new HTML5VideoFullScreen inner classes.
- * With VideoView (typically API level <11), it will always show full-screen.
- * With HTML5VideoFullScreen (typically API level 11+), it will show both in-page and full-screen.
- * <p>
- * IMPORTANT NOTES:
- * - For API level 11+, android:hardwareAccelerated="true" must be set in the application manifest.
- * - The invoking activity must call VideoEnabledWebChromeClient's onBackPressed() inside of its own onBackPressed().
- * - Tested in Android API level 8+. Only tested on http://m.youtube.com.
- *
- * @author Cristian Perez (http://cpr.name)
- */
-public class VideoEnabledWebChromeClient extends WebChromeClient implements OnPreparedListener, OnCompletionListener, OnErrorListener {
-  public interface ToggledFullscreenCallback {
-    public void toggledFullscreen(boolean fullscreen);
-  }
-
-  private View activityNonVideoView;
-  private ViewGroup activityVideoView;
-  private View loadingView;
-  private VideoEnabledWebView webView;
-
-  private boolean isVideoFullscreen; // Indicates if the video is being displayed using a custom view (typically full-screen)
-  private FrameLayout videoViewContainer;
-  private CustomViewCallback videoViewCallback;
-
-  private ToggledFullscreenCallback toggledFullscreenCallback;
-
-  /**
-   * Never use this constructor alone.
-   * This constructor allows this class to be defined as an inline inner class in which the user can override methods
-   */
-  public VideoEnabledWebChromeClient() {
-  }
-
-  /**
-   * Builds a video enabled WebChromeClient.
-   *
-   * @param activityNonVideoView A View in the activity's layout that contains every other view that should be hidden when the video goes full-screen.
-   * @param activityVideoView    A ViewGroup in the activity's layout that will display the video. Typically you would like this to fill the whole layout.
-   */
-  public VideoEnabledWebChromeClient(View activityNonVideoView, ViewGroup activityVideoView) {
-    this.activityNonVideoView = activityNonVideoView;
-    this.activityVideoView = activityVideoView;
-    this.loadingView = null;
-    this.webView = null;
-    this.isVideoFullscreen = false;
-  }
-
-  /**
-   * Builds a video enabled WebChromeClient.
-   *
-   * @param activityNonVideoView A View in the activity's layout that contains every other view that should be hidden when the video goes full-screen.
-   * @param activityVideoView    A ViewGroup in the activity's layout that will display the video. Typically you would like this to fill the whole layout.
-   * @param loadingView          A View to be shown while the video is loading (typically only used in API level <11). Must be already inflated and without a parent view.
-   */
-  public VideoEnabledWebChromeClient(View activityNonVideoView, ViewGroup activityVideoView, View loadingView) {
-    this.activityNonVideoView = activityNonVideoView;
-    this.activityVideoView = activityVideoView;
-    this.loadingView = loadingView;
-    this.webView = null;
-    this.isVideoFullscreen = false;
-  }
-
-  /**
-   * Builds a video enabled WebChromeClient.
-   *
-   * @param activityNonVideoView A View in the activity's layout that contains every other view that should be hidden when the video goes full-screen.
-   * @param activityVideoView    A ViewGroup in the activity's layout that will display the video. Typically you would like this to fill the whole layout.
-   * @param loadingView          A View to be shown while the video is loading (typically only used in API level <11). Must be already inflated and without a parent view.
-   * @param webView              The owner VideoEnabledWebView. Passing it will enable the VideoEnabledWebChromeClient to detect the HTML5 video ended event and exit full-screen.
-   *                             Note: The web page must only contain one video tag in order for the HTML5 video ended event to work. This could be improved if needed (see Javascript code).
-   */
-  public VideoEnabledWebChromeClient(View activityNonVideoView, ViewGroup activityVideoView, View loadingView, VideoEnabledWebView webView) {
-    this.activityNonVideoView = activityNonVideoView;
-    this.activityVideoView = activityVideoView;
-    this.loadingView = loadingView;
-    this.webView = webView;
-    this.isVideoFullscreen = false;
-  }
-
-  /**
-   * Indicates if the video is being displayed using a custom view (typically full-screen)
-   *
-   * @return true it the video is being displayed using a custom view (typically full-screen)
-   */
-  public boolean isVideoFullscreen() {
-    return isVideoFullscreen;
-  }
-
-  /**
-   * Set a callback that will be fired when the video starts or finishes displaying using a custom view (typically full-screen)
-   *
-   * @param callback A VideoEnabledWebChromeClient.ToggledFullscreenCallback callback
-   */
-  public void setOnToggledFullscreen(ToggledFullscreenCallback callback) {
-    this.toggledFullscreenCallback = callback;
-  }
-
-  @Override
-  public void onShowCustomView(View view, CustomViewCallback callback) {
-    if (view instanceof FrameLayout) {
-      // A video wants to be shown
-      FrameLayout frameLayout = (FrameLayout) view;
-      View focusedChild = frameLayout.getFocusedChild();
-
-      // Save video related variables
-      this.isVideoFullscreen = true;
-      this.videoViewContainer = frameLayout;
-      this.videoViewCallback = callback;
-
-      // Hide the non-video view, add the video view, and show it
-      activityNonVideoView.setVisibility(View.INVISIBLE);
-//      activityVideoView.addView(videoViewContainer, new LayoutParams(LayoutParams.MATCH_PARENT, LayoutParams.MATCH_PARENT));
-      activityVideoView.addView(videoViewContainer);
-      activityVideoView.setVisibility(View.VISIBLE);
-
-      if (focusedChild instanceof VideoView) {
-        // VideoView (typically API level <11)
-        VideoView videoView = (VideoView) focusedChild;
-        // Handle all the required events
-        videoView.setOnPreparedListener(this);
-        videoView.setOnCompletionListener(this);
-        videoView.setOnErrorListener(this);
-      }
-      else // Usually android.webkit.HTML5VideoFullScreen$VideoSurfaceView, sometimes android.webkit.HTML5VideoFullScreen$VideoTextureView
-      {
-        // HTML5VideoFullScreen (typically API level 11+)
-        // Handle HTML5 video ended event
-        if (webView != null && webView.getSettings().getJavaScriptEnabled()) {
-          // Run javascript code that detects the video end and notifies the interface
-          String js = "javascript:";
-          js += "_ytrp_html5_video = document.getElementsByTagName('video')[0];";
-          js += "if (_ytrp_html5_video !== undefined) {";
-          {
-            js += "function _ytrp_html5_video_ended() {";
-            {
-              js += "_ytrp_html5_video.removeEventListener('ended', _ytrp_html5_video_ended);";
-              js += "_VideoEnabledWebView.notifyVideoEnd();"; // Must match Javascript interface name and method of VideoEnableWebView
-            }
-            js += "}";
-            js += "_ytrp_html5_video.addEventListener('ended', _ytrp_html5_video_ended);";
-          }
-          js += "}";
-          webView.loadUrl(js);
-        }
-      }
-
-      // Notify full-screen change
-      if (toggledFullscreenCallback != null) {
-        toggledFullscreenCallback.toggledFullscreen(true);
-      }
-    }
-  }
-
-  @Override
-  public void onShowCustomView(View view, int requestedOrientation, CustomViewCallback callback) // Only available in API level 14+
-  {
-    onShowCustomView(view, callback);
-  }
-
-  @Override
-  public void onHideCustomView() {
-    // This method must be manually (internally) called on video end in the case of VideoView (typically API level <11)
-    // This method must be manually (internally) called on video end in the case of HTML5VideoFullScreen (typically API level 11+) because it's not always called automatically
-    // This method must be manually (internally) called on back key press (from this class' onBackPressed() method)
-
-    if (isVideoFullscreen) {
-      // Hide the video view, remove it, and show the non-video view
-      activityVideoView.setVisibility(View.INVISIBLE);
-      activityVideoView.removeView(videoViewContainer);
-      activityNonVideoView.setVisibility(View.VISIBLE);
-
-      // Call back
-      if (videoViewCallback != null) { videoViewCallback.onCustomViewHidden(); }
-
-      // Reset video related variables
-      isVideoFullscreen = false;
-      videoViewContainer = null;
-      videoViewCallback = null;
-
-      // Notify full-screen change
-      if (toggledFullscreenCallback != null) {
-        toggledFullscreenCallback.toggledFullscreen(false);
-      }
-    }
-  }
-
-  @Override
-  public View getVideoLoadingProgressView() // Video will start loading, only called in the case of VideoView (typically API level <11)
-  {
-    if (loadingView != null) {
-      loadingView.setVisibility(View.VISIBLE);
-      return loadingView;
-    }
-    else {
-      return super.getVideoLoadingProgressView();
-    }
-  }
-
-  @Override
-  public void onPrepared(MediaPlayer mp) // Video will start playing, only called in the case of VideoView (typically API level <11)
-  {
-    if (loadingView != null) {
-      loadingView.setVisibility(View.GONE);
-    }
-  }
-
-  @Override
-  public void onCompletion(MediaPlayer mp) // Video finished playing, only called in the case of VideoView (typically API level <11)
-  {
-    onHideCustomView();
-  }
-
-  @Override
-  public boolean onError(MediaPlayer mp, int what, int extra) // Error while playing video, only called in the case of VideoView (typically API level <11)
-  {
-    return false; // By returning false, onCompletion() will be called
-  }
-
-  /**
-   * Notifies the class that the back key has been pressed by the user.
-   * This must be called from the Activity's onBackPressed(), and if it returns false, the activity itself should handle it. Otherwise don't do anything.
-   *
-   * @return Returns true if the event was handled, and false if it is not (video view is not visible)
-   */
-  public boolean onBackPressed() {
-    if (isVideoFullscreen) {
-      onHideCustomView();
-      return true;
-    }
-    else {
-      return false;
-    }
-  }
-
-}

+ 0 - 147
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/contents/VideoEnabledWebView.java

@@ -1,147 +0,0 @@
-/*
- * COPYRIGHT (c) 2018 All rights reserved by HANWHA LIFE.
- */
-package kr.co.zumo.app.lifeplus.view.screen.contents;
-
-/**
- * VideoEnabledWebView
- * <pre>
- * </pre>
- *
- * @author 민효동
- * @version 1.0
- * @history 민효동   [2018. 12. 16.]   [최초 작성]
- * @since 2018. 12. 16.
- */
-import android.annotation.SuppressLint;
-import android.content.Context;
-import android.os.Handler;
-import android.os.Looper;
-import android.util.AttributeSet;
-import android.webkit.WebChromeClient;
-import android.webkit.WebView;
-
-import java.util.Map;
-
-/**
- * This class serves as a WebView to be used in conjunction with a VideoEnabledWebChromeClient.
- * It makes possible:
- * - To detect the HTML5 video ended event so that the VideoEnabledWebChromeClient can exit full-screen.
- *
- * Important notes:
- * - Javascript is enabled by default and must not be disabled with getSettings().setJavaScriptEnabled(false).
- * - setWebChromeClient() must be called before any loadData(), loadDataWithBaseURL() or loadUrl() method.
- *
- * @author Cristian Perez (http://cpr.name)
- *
- */
-public class VideoEnabledWebView extends WebView
-{
-  public class JavascriptInterface
-  {
-    @android.webkit.JavascriptInterface
-    public void notifyVideoEnd() // Must match Javascript interface method of VideoEnabledWebChromeClient
-    {
-      // This code is not executed in the UI thread, so we must force that to happen
-      new Handler(Looper.getMainLooper()).post(new Runnable()
-      {
-        @Override
-        public void run()
-        {
-          if (videoEnabledWebChromeClient != null)
-          {
-            videoEnabledWebChromeClient.onHideCustomView();
-          }
-        }
-      });
-    }
-  }
-
-  private VideoEnabledWebChromeClient videoEnabledWebChromeClient;
-  private boolean addedJavascriptInterface;
-
-  public VideoEnabledWebView(Context context)
-  {
-    super(context);
-    addedJavascriptInterface = false;
-  }
-
-  @SuppressWarnings("unused")
-  public VideoEnabledWebView(Context context, AttributeSet attrs)
-  {
-    super(context, attrs);
-    addedJavascriptInterface = false;
-  }
-
-  @SuppressWarnings("unused")
-  public VideoEnabledWebView(Context context, AttributeSet attrs, int defStyle)
-  {
-    super(context, attrs, defStyle);
-    addedJavascriptInterface = false;
-  }
-
-  /**
-   * Indicates if the video is being displayed using a custom view (typically full-screen)
-   * @return true it the video is being displayed using a custom view (typically full-screen)
-   */
-  public boolean isVideoFullscreen()
-  {
-    return videoEnabledWebChromeClient != null && videoEnabledWebChromeClient.isVideoFullscreen();
-  }
-
-  /**
-   * Pass only a VideoEnabledWebChromeClient instance.
-   */
-  @Override @SuppressLint("SetJavaScriptEnabled")
-  public void setWebChromeClient(WebChromeClient client)
-  {
-    getSettings().setJavaScriptEnabled(true);
-
-    if (client instanceof VideoEnabledWebChromeClient)
-    {
-      this.videoEnabledWebChromeClient = (VideoEnabledWebChromeClient) client;
-    }
-
-    super.setWebChromeClient(client);
-  }
-
-  @Override
-  public void loadData(String data, String mimeType, String encoding)
-  {
-    addJavascriptInterface();
-    super.loadData(data, mimeType, encoding);
-  }
-
-  @Override
-  public void loadDataWithBaseURL(String baseUrl, String data, String mimeType, String encoding, String historyUrl)
-  {
-    addJavascriptInterface();
-    super.loadDataWithBaseURL(baseUrl, data, mimeType, encoding, historyUrl);
-  }
-
-  @Override
-  public void loadUrl(String url)
-  {
-    addJavascriptInterface();
-    super.loadUrl(url);
-  }
-
-  @Override
-  public void loadUrl(String url, Map<String, String> additionalHttpHeaders)
-  {
-    addJavascriptInterface();
-    super.loadUrl(url, additionalHttpHeaders);
-  }
-
-  private void addJavascriptInterface()
-  {
-    if (!addedJavascriptInterface)
-    {
-      // Add javascript interface to be called when the video ends (must be done before page load)
-      addJavascriptInterface(new JavascriptInterface(), "_VideoEnabledWebView"); // Must match Javascript interface name of VideoEnabledWebChromeClient
-
-      addedJavascriptInterface = true;
-    }
-  }
-
-}

+ 18 - 2
app/src/main/java/kr/co/zumo/app/lifeplus/view/screen/guide/LifeplusBrandFragment.java

@@ -5,7 +5,6 @@ import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.support.v4.app.Fragment;
-import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -16,6 +15,7 @@ import android.webkit.WebView;
 import android.webkit.WebViewClient;
 
 import kr.co.zumo.app.R;
+import kr.co.zumo.app.lifeplus.view.custom.VideoWebChromeClient;
 
 /**
  * LifeplusXFragment
@@ -29,8 +29,10 @@ import kr.co.zumo.app.R;
  */
 public class LifeplusBrandFragment extends Fragment {
 
+
+//  private RecyclerView recyclerViewLifeplusX;
+
   private WebView webView;
-  private RecyclerView recyclerViewLifeplusX;
 
   @Nullable
   @Override
@@ -57,6 +59,20 @@ public class LifeplusBrandFragment extends Fragment {
       }
     });
 
+    webView.setWebChromeClient(new VideoWebChromeClient(getActivity()) {
+      @Override
+      public void onShowCustomView(View view, CustomViewCallback callback) {
+        super.onShowCustomView(view, callback);
+        webView.setVisibility(View.GONE);
+      }
+
+      @Override
+      public void onHideCustomView() {
+        super.onHideCustomView();
+        webView.setVisibility(View.VISIBLE);
+      }
+    });
+
     init(webView);
 
     webView.loadUrl("https://lifeplus.app/resources/homepage/LP_introduce.html");

+ 0 - 15
app/src/main/res/layout/contents_html.xml

@@ -7,7 +7,6 @@
   android:layout_height="match_parent"
   android:descendantFocusability="blocksDescendants">
 
-  <!--<kr.co.zumo.app.lifeplus.view.screen.contents.VideoEnabledWebView-->
   <WebView
     android:id="@+id/web_view"
     android:layout_width="match_parent"
@@ -72,18 +71,4 @@
     android:background="@drawable/card_dim_bottom_12"
     app:layout_constraintBottom_toBottomOf="parent"/>
 
-  <FrameLayout
-    android:id="@+id/layout_full_screen_background"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/C000000"
-    android:visibility="gone"
-    tools:visibility="visible"/>
-
-  <FrameLayout
-    android:id="@+id/layout_full_screen"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@null"
-    android:visibility="gone"/>
 </android.support.constraint.ConstraintLayout>

+ 1 - 2
app/src/main/res/layout/life_plus_brand_layout.xml

@@ -11,7 +11,6 @@
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     app:layout_constraintEnd_toEndOf="parent"
-    app:layout_constraintStart_toStartOf="parent">
+    app:layout_constraintStart_toStartOf="parent"/>
 
-  </kr.co.zumo.app.lifeplus.view.custom.NestedWebView>
 </android.support.constraint.ConstraintLayout>