diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 1f2af51..96cc43e 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -11,6 +11,7 @@
       <entry name="!?*.flex" />
       <entry name="!?*.kt" />
       <entry name="!?*.clj" />
+      <entry name="!?*.aj" />
     </wildcardResourcePatterns>
     <annotationProcessing>
       <profile default="true" name="Default" enabled="false">
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a8a57c3..7d80135 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -5,7 +5,7 @@
       <GradleProjectSettings>
         <option name="distributionType" value="LOCAL" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="E:\Android\android-studio\gradle\gradle-2.4" />
+        <option name="gradleHome" value="C:\Program Files\Android\Android Studio\gradle\gradle-2.4" />
         <option name="gradleJvm" value="1.7" />
         <option name="modules">
           <set>
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 6a1e020..1a3eaff 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -37,7 +37,7 @@
     <ConfirmationsSetting value="0" id="Add" />
     <ConfirmationsSetting value="0" id="Remove" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.7" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/README.md b/README.md
index a320ebc..7c854d3 100644
--- a/README.md
+++ b/README.md
@@ -30,6 +30,12 @@ Very little code, are all here
 代码非常少，都在这里
 
 [ParallaxSwipeBackActivity](https://github.com/bushijie/ParallaxSwipeBack/blob/master/app/src/main/java/com/bureak/parallaxswipeback/ParallaxSwipeBackActivity.java)
+
+解决侧滑与ViewPager滑动冲突
+-----
+
+
 Thinks
 -----
+
 [http://blog.csdn.net/hanhailong726188/article/details/46433229](http://blog.csdn.net/hanhailong726188/article/details/46433229)
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index af8dcb9..9682f9f 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -20,6 +20,9 @@
         <activity
             android:name=".NextActivity"
             android:theme="@style/AppTranslucentTheme" />
+        <activity
+            android:name=".ViewPagerActivity"
+            android:theme="@style/AppTranslucentTheme" />
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage1Fragment.java b/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage1Fragment.java
new file mode 100644
index 0000000..154c7ee
--- /dev/null
+++ b/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage1Fragment.java
@@ -0,0 +1,44 @@
+package com.bureak.parallaxswipeback;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class FragmentPage1Fragment
+        extends Fragment
+{
+    TextView textView;
+
+    // 要显示的视图
+    protected View currentView = null;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState)
+    {
+        currentView = inflater.inflate(R.layout.fragment_page, container, false);
+        return currentView;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState)
+    {
+        super.onActivityCreated(savedInstanceState);
+
+        textView = (TextView) currentView.findViewById(R.id.tv_fragment_page);
+
+        // 初始化
+        init();
+    }
+
+    /**
+     * 初始化
+     */
+    protected void init()
+    {
+        textView.setText("页卡1");
+    }
+}
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage2Fragment.java b/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage2Fragment.java
new file mode 100644
index 0000000..e51e94b
--- /dev/null
+++ b/app/src/main/java/com/bureak/parallaxswipeback/FragmentPage2Fragment.java
@@ -0,0 +1,44 @@
+package com.bureak.parallaxswipeback;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+public class FragmentPage2Fragment
+        extends Fragment
+{
+    TextView textView;
+
+    // 要显示的视图
+    protected View currentView = null;
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                             Bundle savedInstanceState)
+    {
+        currentView = inflater.inflate(R.layout.fragment_page, container, false);
+        return currentView;
+    }
+
+    @Override
+    public void onActivityCreated(Bundle savedInstanceState)
+    {
+        super.onActivityCreated(savedInstanceState);
+
+        textView = (TextView) currentView.findViewById(R.id.tv_fragment_page);
+
+        // 初始化
+        init();
+    }
+
+    /**
+     * 初始化
+     */
+    protected void init()
+    {
+        textView.setText("页卡2");
+    }
+}
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
index c416b8e..8e14b5a 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/MainActivity.java
@@ -13,41 +13,55 @@
  * @Description: 主界面
  * Created by bushijie33@gmail.com on 2015/7/5.
  */
-public class MainActivity extends ParallaxSwipeBackActivity {
+public class MainActivity
+        extends ParallaxSwipeBackActivity
+{
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
-        findViewById(R.id.next).setOnClickListener(new View.OnClickListener() {
+        findViewById(R.id.next).setOnClickListener(new View.OnClickListener()
+        {
             @Override
-            public void onClick(View v) {
-                Intent intent = new Intent(MainActivity.this,NextActivity.class);
-                intent.putExtra("index",0);
+            public void onClick(View v)
+            {
+                Intent intent = new Intent(MainActivity.this, NextActivity.class);
+                intent.putExtra("index", 0);
                 startParallaxSwipeBackActivty(MainActivity.this, intent);
             }
         });
 
     }
 
+    public void onClick(View view)
+    {
+        Intent intent = new Intent(this, ViewPagerActivity.class);
+        startActivity(intent);
+    }
+
     @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
+    public boolean onCreateOptionsMenu(Menu menu)
+    {
         // Inflate the menu; this adds items to the action bar if it is present.
         getMenuInflater().inflate(R.menu.menu_main, menu);
         return true;
     }
 
     @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
+    public boolean onOptionsItemSelected(MenuItem item)
+    {
         // Handle action bar item clicks here. The action bar will
         // automatically handle clicks on the Home/Up button, so long
         // as you specify a parent activity in AndroidManifest.xml.
         int id = item.getItemId();
 
         //noinspection SimplifiableIfStatement
-        if (id == R.id.action_settings) {
+        if (id == R.id.action_settings)
+        {
             Uri uri = Uri.parse("https://github.com/bushijie/ParallaxSwipeBack");
-            startActivity(new Intent(Intent.ACTION_VIEW,uri));
+            startActivity(new Intent(Intent.ACTION_VIEW, uri));
             return true;
         }
 
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/PagerEnabledSlidingPaneLayout.java b/app/src/main/java/com/bureak/parallaxswipeback/PagerEnabledSlidingPaneLayout.java
new file mode 100644
index 0000000..3685619
--- /dev/null
+++ b/app/src/main/java/com/bureak/parallaxswipeback/PagerEnabledSlidingPaneLayout.java
@@ -0,0 +1,78 @@
+package com.bureak.parallaxswipeback;
+
+/**
+ * Created by 杨永青 on 2015/8/21.
+ */
+
+import android.content.Context;
+import android.support.v4.view.MotionEventCompat;
+import android.support.v4.widget.SlidingPaneLayout;
+import android.util.AttributeSet;
+import android.view.MotionEvent;
+import android.view.ViewConfiguration;
+
+/**
+ * Created by apaojun on 2015/2/12.
+ */
+public class PagerEnabledSlidingPaneLayout
+        extends SlidingPaneLayout
+{
+
+    private float mInitialMotionX;
+    private float mInitialMotionY;
+    private float mEdgeSlop;
+
+    public PagerEnabledSlidingPaneLayout(Context context)
+    {
+        this(context, null);
+    }
+
+    public PagerEnabledSlidingPaneLayout(Context context, AttributeSet attrs)
+    {
+        this(context, attrs, 0);
+    }
+
+    public PagerEnabledSlidingPaneLayout(Context context, AttributeSet attrs, int defStyle)
+    {
+        super(context, attrs, defStyle);
+
+        ViewConfiguration config = ViewConfiguration.get(context);
+        mEdgeSlop = config.getScaledEdgeSlop();
+    }
+
+    @Override
+    public boolean onInterceptTouchEvent(MotionEvent ev)
+    {
+
+        switch (MotionEventCompat.getActionMasked(ev))
+        {
+            case MotionEvent.ACTION_DOWN:
+            {
+                mInitialMotionX = ev.getX();
+                mInitialMotionY = ev.getY();
+                break;
+            }
+
+            case MotionEvent.ACTION_MOVE:
+            {
+                final float x = ev.getX();
+                final float y = ev.getY();
+                // The user should always be able to "close" the pane, so we only check
+                // for child scrollability if the pane is currently closed.
+                if (mInitialMotionX > mEdgeSlop && !isOpen() && canScroll(this, false,
+                        Math.round(x - mInitialMotionX), Math.round(x), Math.round(y)))
+                {
+
+                    // How do we set super.mIsUnableToDrag = true?
+
+                    // send the parent a cancel event
+                    MotionEvent cancelEvent = MotionEvent.obtain(ev);
+                    cancelEvent.setAction(MotionEvent.ACTION_CANCEL);
+                    return super.onInterceptTouchEvent(cancelEvent);
+                }
+            }
+        }
+
+        return super.onInterceptTouchEvent(ev);
+    }
+}
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/ParallaxSwipeBackActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/ParallaxSwipeBackActivity.java
index 53e84aa..3e7336e 100644
--- a/app/src/main/java/com/bureak/parallaxswipeback/ParallaxSwipeBackActivity.java
+++ b/app/src/main/java/com/bureak/parallaxswipeback/ParallaxSwipeBackActivity.java
@@ -9,7 +9,6 @@
 import android.support.v4.widget.SlidingPaneLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
-import android.view.Gravity;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.FrameLayout;
@@ -30,7 +29,7 @@ public class ParallaxSwipeBackActivity extends AppCompatActivity implements Slid
     private final static String TAG = ParallaxSwipeBackActivity.class.getSimpleName();
     private final static String WINDOWBITMAP = "screenshots.jpg";
     private File mFileTemp;
-    private SlidingPaneLayout slidingPaneLayout;
+    private PagerEnabledSlidingPaneLayout slidingPaneLayout;
     private FrameLayout frameLayout;
     private ImageView behindImageView;
     private ImageView shadowImageView;
@@ -41,7 +40,7 @@ public class ParallaxSwipeBackActivity extends AppCompatActivity implements Slid
     protected void onCreate(Bundle savedInstanceState) {
         //通过反射来改变SlidingPanelayout的值
         try {
-            slidingPaneLayout = new SlidingPaneLayout(this);
+            slidingPaneLayout = new PagerEnabledSlidingPaneLayout(this);
             Field f_overHang = SlidingPaneLayout.class.getDeclaredField("mOverhangSize");
             f_overHang.setAccessible(true);
             f_overHang.set(slidingPaneLayout, 0);
diff --git a/app/src/main/java/com/bureak/parallaxswipeback/ViewPagerActivity.java b/app/src/main/java/com/bureak/parallaxswipeback/ViewPagerActivity.java
new file mode 100644
index 0000000..d619d9b
--- /dev/null
+++ b/app/src/main/java/com/bureak/parallaxswipeback/ViewPagerActivity.java
@@ -0,0 +1,138 @@
+package com.bureak.parallaxswipeback;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.view.View;
+import android.view.ViewGroup;
+import android.widget.TextView;
+
+import java.util.ArrayList;
+
+
+/**
+ * Created by 杨永青 on 2015/8/25.
+ */
+public class ViewPagerActivity
+        extends ParallaxSwipeBackActivity
+{
+    ViewPager mainViewPager;
+
+    TextView textView1;
+
+    TextView textView2;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState)
+    {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_group_viewpager);
+
+        mainViewPager = (ViewPager) findViewById(R.id.main_viewpager);
+        textView1 = (TextView) findViewById(R.id.textView1);
+        textView2 = (TextView) findViewById(R.id.textView2);
+
+        setOnListener();
+        // 初始化
+        init();
+    }
+
+    private void setOnListener()
+    {
+        mainViewPager.setOnPageChangeListener(new MyOnPagerChangeListener());
+
+    }
+
+    /**
+     * 初始化
+     */
+    private void init()
+    {
+        mainViewPager.setAdapter(new MainViewPagerAdapter(getSupportFragmentManager()));
+        mainViewPager.setCurrentItem(0);
+        // 设置ViewPager可以缓存两个界面，这样子就不会重复的去加载界面
+        mainViewPager.setOffscreenPageLimit(2);
+    }
+
+    public void onClick(View view)
+    {
+        switch (view.getId())
+        {
+            case R.id.textView1:
+                mainViewPager.setCurrentItem(0);
+                break;
+            case R.id.textView2:
+                mainViewPager.setCurrentItem(1);
+                break;
+        }
+    }
+
+    /**
+     * ViewPager页卡适配器
+     */
+    public class MainViewPagerAdapter
+            extends FragmentPagerAdapter
+    {
+        private ArrayList<Fragment> mFragments;
+
+        public MainViewPagerAdapter(FragmentManager fm)
+        {
+            super(fm);
+            mFragments = new ArrayList<Fragment>();
+            mFragments.add(new FragmentPage1Fragment());
+            mFragments.add(new FragmentPage2Fragment());
+        }
+
+        @Override
+        public Object instantiateItem(ViewGroup container, int position)
+        {
+            return super.instantiateItem(container, position);
+        }
+
+        @Override
+        public int getCount()
+        {
+            return mFragments.size();
+        }
+
+        @Override
+        public Fragment getItem(int position)
+        {
+            return mFragments.get(position);
+        }
+    }
+
+    /**
+     * ViewPager页面改变监听
+     */
+    private class MyOnPagerChangeListener
+            implements ViewPager.OnPageChangeListener
+    {
+        @Override
+        public void onPageScrollStateChanged(int arg0)
+        {
+        }
+
+        @Override
+        public void onPageScrolled(int arg0, float arg1, int arg2)
+        {
+        }
+
+        @Override
+        public void onPageSelected(int position)
+        {
+            textView1.setTextColor(getResources().getColor(android.R.color.black));
+            textView2.setTextColor(getResources().getColor(android.R.color.black));
+            if (position == 0)
+            {
+                textView1.setTextColor(getResources().getColor(android.R.color.holo_green_light));
+            }
+            else
+            {
+                textView2.setTextColor(getResources().getColor(android.R.color.holo_green_light));
+            }
+        }
+    }
+}
diff --git a/app/src/main/res/layout/activity_group_viewpager.xml b/app/src/main/res/layout/activity_group_viewpager.xml
new file mode 100644
index 0000000..6c93101
--- /dev/null
+++ b/app/src/main/res/layout/activity_group_viewpager.xml
@@ -0,0 +1,49 @@
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <!-- 要显示的界面 -->
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:layout_weight="1"
+        android:orientation="vertical" >
+
+        <android.support.v4.view.ViewPager
+            android:id="@+id/main_viewpager"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center" />
+    </LinearLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:background="@android:color/darker_gray"
+        android:orientation="horizontal"
+        android:padding="10dp" >
+
+        <TextView
+            android:id="@+id/textView1"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:gravity="center"
+            android:text="页卡1"
+            android:textColor="@android:color/black" />
+
+        <TextView
+            android:id="@+id/textView2"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:clickable="true"
+            android:gravity="center"
+            android:text="页卡2"
+            android:textColor="@android:color/black" />
+    </LinearLayout>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 8709b90..de51029 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,20 +1,33 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:paddingBottom="@dimen/activity_vertical_margin"
-    android:paddingLeft="@dimen/activity_horizontal_margin"
-    android:paddingRight="@dimen/activity_horizontal_margin"
-    android:paddingTop="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity">
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              xmlns:tools="http://schemas.android.com/tools"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="@dimen/activity_vertical_margin"
+              android:paddingLeft="@dimen/activity_horizontal_margin"
+              android:paddingRight="@dimen/activity_horizontal_margin"
+              android:paddingTop="@dimen/activity_vertical_margin"
+              android:gravity="center"
+              tools:context=".MainActivity">
 
     <Button
         android:id="@+id/next"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
-        android:textSize="16sp"
         android:padding="12dp"
-        android:text="@string/next" />
+        android:text="@string/next"
+        android:textSize="16sp"/>
 
-</RelativeLayout>
+    <Button
+        android:id="@+id/btn_viewpager"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:layout_marginTop="20dp"
+        android:onClick="onClick"
+        android:padding="12dp"
+        android:text="start viewpager"
+        android:textSize="16sp"/>
+
+</LinearLayout>
diff --git a/app/src/main/res/layout/fragment_page.xml b/app/src/main/res/layout/fragment_page.xml
new file mode 100644
index 0000000..5fb239e
--- /dev/null
+++ b/app/src/main/res/layout/fragment_page.xml
@@ -0,0 +1,13 @@
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical" >
+
+    <TextView
+        android:id="@+id/tv_fragment_page"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_centerInParent="true"
+        android:textAppearance="?android:attr/textAppearanceLarge" />
+
+</RelativeLayout>
\ No newline at end of file