Merge pull request GcsSloop#39 from dengyuhan/master

修复android8.1以上 圆角圆形剪裁失效的问题

RCLayout/build.gradle

@@ -23,12 +23,12 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
     }

README.md

@@ -9,7 +9,7 @@ Android 通用圆角布局，快速实现圆角需求。
 ## 效果预览
 
 <p>
-<img src="http://ww1.sinaimg.cn/large/005Xtdi2gy1fqbgk8pmevg309u0ghwz9.gif" width="300"/> <img src="https://ww4.sinaimg.cn/large/006tKfTcly1fk7twywj5oj30u01fewka.jpg" width="292"/>
+<img src="Img/Demo_2.gif" height="542"/> <img src="Img/Demo.jpeg" height="542"/>
 </p>
 
 ## 支持的特性

app/build.gradle

@@ -23,12 +23,12 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 26
-    buildToolsVersion "26.0.1"
+    compileSdkVersion 28
+    buildToolsVersion "28.0.3"
     defaultConfig {
         applicationId "com.gcssloop.roundcornerlayouttest"
         minSdkVersion 19
-        targetSdkVersion 26
+        targetSdkVersion 28
         versionCode 1
         versionName "1.0"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
@@ -46,7 +46,7 @@ dependencies {
     androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
         exclude group: 'com.android.support', module: 'support-annotations'
     })
-    compile 'com.android.support:appcompat-v7:26.+'
+    compile 'com.android.support:appcompat-v7:28.+'
     compile 'com.android.support.constraint:constraint-layout:1.0.2'
     testCompile 'junit:junit:4.12'
     compile project(':rclayout')

app/src/main/AndroidManifest.xml

@@ -37,6 +37,7 @@
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name=".MainActivity"/>
         <activity android:name=".AntiAliasActivity" />
     </application>
 

app/src/main/java/com/gcssloop/roundcornerlayouttest/ExampleActivity.java

@@ -150,7 +150,11 @@ private int getProgressRadius(int progress) {
     }
 
     public void clickAntiAlias(View view) {
-        startActivity(new Intent(this,AntiAliasActivity.class));
+        startActivity(new Intent(this, AntiAliasActivity.class));
+    }
+
+    public void clickExample(View view) {
+        startActivity(new Intent(this, MainActivity.class));
     }
 
 

app/src/main/res/layout/activity_example.xml

@@ -5,6 +5,14 @@
     android:layout_height="match_parent"
     android:background="@color/colorActivityBackground">
 
+    <TextView
+        android:layout_margin="10dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:onClick="clickExample"
+        android:text="其它示例"
+        android:textColor="@android:color/white" />
+
     <TextView
         android:layout_alignParentRight="true"
         android:id="@+id/tv_antialias"

build.gradle

@@ -15,6 +15,10 @@ buildscript {
 allprojects {
     repositories {
         jcenter()
+        maven {
+            url 'https://maven.google.com/'
+            name 'Google'
+        }
     }
 }
 

rclayout/src/main/java/com/gcssloop/widget/RCRelativeLayout.java

@@ -25,7 +25,6 @@
 import android.content.Context;
 import android.graphics.Canvas;
 import android.util.AttributeSet;
-import android.util.Log;
 import android.view.MotionEvent;
 import android.widget.Checkable;
 import android.widget.RelativeLayout;

rclayout/src/main/java/com/gcssloop/widget/helper/RCHelper.java

@@ -35,6 +35,7 @@
 import android.graphics.PorterDuffXfermode;
 import android.graphics.RectF;
 import android.graphics.Region;
+import android.os.Build;
 import android.util.AttributeSet;
 import android.view.View;
 import android.widget.Checkable;
@@ -122,12 +123,19 @@ public void refreshRegion(View view) {
             float d = areas.width() >= areas.height() ? areas.height() : areas.width();
             float r = d / 2;
             PointF center = new PointF(w / 2, h / 2);
-            mClipPath.addCircle(center.x, center.y, r, Path.Direction.CW);
+            if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
+                mClipPath.addCircle(center.x, center.y, r, Path.Direction.CW);
+
+                mClipPath.moveTo(0, 0);  // 通过空操作让Path区域占满画布
+                mClipPath.moveTo(w, h);
+            } else {
+                float y = h / 2 - r;
+                mClipPath.moveTo(areas.left, y);
+                mClipPath.addCircle(center.x, y + r, r, Path.Direction.CW);
+            }
         } else {
             mClipPath.addRoundRect(areas, radii, Path.Direction.CW);
         }
-        mClipPath.moveTo(0, 0);  // 通过空操作让Path区域占满画布
-        mClipPath.moveTo(w , h);
         Region clip = new Region((int) areas.left, (int) areas.top,
                 (int) areas.right, (int) areas.bottom);
         mAreaRegion.setPath(mClipPath, clip);
@@ -147,10 +155,20 @@ public void onClipDraw(Canvas canvas) {
             mPaint.setStyle(Paint.Style.STROKE);
             canvas.drawPath(mClipPath, mPaint);
         }
-        mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
         mPaint.setColor(Color.WHITE);
         mPaint.setStyle(Paint.Style.FILL);
-        canvas.drawPath(mClipPath, mPaint);
+
+        if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.O_MR1) {
+            mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_IN));
+            canvas.drawPath(mClipPath, mPaint);
+        } else {
+            mPaint.setXfermode(new PorterDuffXfermode(PorterDuff.Mode.DST_OUT));
+
+            final Path path = new Path();
+            path.addRect(0, 0, (int) mLayer.width(), (int) mLayer.height(), Path.Direction.CW);
+            path.op(mClipPath, Path.Op.DIFFERENCE);
+            canvas.drawPath(path, mPaint);
+        }
     }