更新弹性动画是否覆盖全屏幕

yipianfengye · yipianfengye · commit 4ae804bbabed · 2016-08-04T16:33:35.000+08:00
diff --git a/adlibrary/src/main/java/com/uuch/adlibrary/AdManager.java b/adlibrary/src/main/java/com/uuch/adlibrary/AdManager.java
@@ -65,6 +65,8 @@ public class AdManager {
     private double speed = AdConstant.SPEED;
     // viewPager滑动动画效果
     private ViewPager.PageTransformer pageTransformer = null;
+    // 是否覆盖全屏幕
+    private boolean isOverScreen = true;
 
     private OnImageClickListener onImageClickListener = null;
 
@@ -112,6 +114,7 @@ public void showAdDialog(final int animType) {
                 .setDialogCloseable(isDialogCloseable)
                 .setDialogBackViewColor(backViewColor)
                 .setOnCloseClickListener(onCloseClickListener)
+                .setOverScreen(isOverScreen)
                 .initView(contentView);
         setRootContainerHeight();
 
@@ -194,7 +197,6 @@ public void onFinalImageSet(
                     if (imageInfo == null) {
                         return;
                     }
-                    Log.i("##########", "onFinalImageSet()");
                     errorView.setVisibility(View.GONE);
                     loadingView.setVisibility(View.GONE);
                     simpleDraweeView.setVisibility(View.VISIBLE);
@@ -207,7 +209,6 @@ public void onIntermediateImageSet(String id, @Nullable ImageInfo imageInfo) {
 
                 @Override
                 public void onFailure(String id, Throwable throwable) {
-                    Log.i("#############", "onFilure()");
                     errorView.setVisibility(View.VISIBLE);
                     loadingView.setVisibility(View.GONE);
                     simpleDraweeView.setVisibility(View.GONE);
@@ -349,4 +350,15 @@ public AdManager setPageTransformer(ViewPager.PageTransformer pageTransformer) {
 
         return this;
     }
+
+    /**
+     * 设置弹窗背景是否覆盖全屏幕
+     * @param overScreen
+     * @return
+     */
+    public AdManager setOverScreen(boolean overScreen) {
+        isOverScreen = overScreen;
+
+        return this;
+    }
 }
diff --git a/adlibrary/src/main/java/com/uuch/adlibrary/AnimDialogUtils.java b/adlibrary/src/main/java/com/uuch/adlibrary/AnimDialogUtils.java
@@ -35,6 +35,8 @@ public class AnimDialogUtils {
     private View.OnClickListener onCloseClickListener = null;
     // 设置弹窗背景颜色
     private int backViewColor = Color.parseColor("#bf000000");
+    // 弹窗背景是否覆盖全屏幕
+    private boolean isOverScreen = true;
 
     private AnimDialogUtils(Activity context) {
         this.context = context;
@@ -51,7 +53,11 @@ public static AnimDialogUtils getInstance(Activity context) {
      * @return
      */
     public AnimDialogUtils initView(final View customView) {
-        androidContentView = (ViewGroup) context.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        if (isOverScreen) {
+            androidContentView = (ViewGroup) context.getWindow().getDecorView();
+        } else {
+            androidContentView = (ViewGroup) context.getWindow().findViewById(Window.ID_ANDROID_CONTENT);
+        }
         rootView = LayoutInflater.from(context).inflate(R.layout.anim_dialog_layout, null);
         rootView.setTag(ANIM_DIALOG_TAG);
 
@@ -148,6 +154,16 @@ public AnimDialogUtils setAnimBackViewTransparent(boolean animBackViewTransparen
         return this;
     }
 
+    /**
+     * 设置弹窗背景是否覆盖全屏幕
+     * @param overScreen
+     */
+    public AnimDialogUtils setOverScreen(boolean overScreen) {
+        isOverScreen = overScreen;
+
+        return this;
+    }
+
     // ################### get方法 ####################
 
     public RelativeLayout getAnimContainer() {
diff --git a/adlibrary/src/main/res/layout/ad_dialog_content_layout.xml b/adlibrary/src/main/res/layout/ad_dialog_content_layout.xml
@@ -3,7 +3,8 @@
     xmlns:fpi="http://schemas.android.com/apk/res-auto"
     android:id="@+id/ad_root_content"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content">
+    android:layout_height="wrap_content"
+    >
 
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
diff --git a/adlibrary/src/main/res/layout/anim_dialog_layout.xml b/adlibrary/src/main/res/layout/anim_dialog_layout.xml
@@ -14,6 +14,7 @@
         android:layout_centerInParent="true"
         android:layout_marginLeft="44dp"
         android:layout_marginRight="44dp"
+        android:paddingTop="48dp"
         >
 
         <FrameLayout
diff --git a/app/src/main/java/com/uuch/android_addialog/MainActivity.java b/app/src/main/java/com/uuch/android_addialog/MainActivity.java
@@ -14,6 +14,7 @@
 import com.uuch.adlibrary.AdConstant;
 import com.uuch.adlibrary.bean.AdInfo;
 import com.uuch.adlibrary.AdManager;
+import com.uuch.adlibrary.transformer.DepthPageTransformer;
 import com.uuch.adlibrary.transformer.ZoomOutPageTransformer;
 
 import java.util.ArrayList;
@@ -188,7 +189,7 @@ public void onImageClick(View view, AdInfo advInfo) {
                     }
                 })
                 .setPadding(100)
-                .setWidthPerHeight(1f)
+                .setWidthPerHeight(0.5f)
                 .showAdDialog(AdConstant.ANIM_UP_TO_DOWN);
             }
         });
@@ -223,6 +224,7 @@ public void onImageClick(View view, AdInfo advInfo) {
                 })
                 .setBounciness(15)
                 .setDialogCloseable(true)
+                .setOverScreen(false)
                 .showAdDialog(AdConstant.ANIM_UP_TO_DOWN);
             }
         });
@@ -238,7 +240,7 @@ public void onImageClick(View view, AdInfo advInfo) {
                         Toast.makeText(MainActivity.this, "您点击了ViewPagerItem...", Toast.LENGTH_SHORT).show();
                     }
                 })
-                .setPageTransformer(new ZoomOutPageTransformer())
+                .setPageTransformer(new DepthPageTransformer())
                 .showAdDialog(AdConstant.ANIM_UP_TO_DOWN);
             }
         });

Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`	`android:layout_centerInParent="true"`
`15`	`15`	`android:layout_marginLeft="44dp"`
`16`	`16`	`android:layout_marginRight="44dp"`
	`17`	`+ android:paddingTop="48dp"`
`17`	`18`	`>`
`18`	`19`
`19`	`20`	`<FrameLayout`