change: 解决编译失败的问题

Author: Lesion

demo/src/main/java/com/xinlan/imageeditandroid/MainActivity.java

@@ -48,11 +48,12 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
 
     private View mTakenPhoto;//拍摄照片用于编辑
     private Uri photoURI = null;
+    private String savePath = null;
 
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.image_editor_activity_main);
+        setContentView(R.layout.activity_main);
         initView();
     }
 
@@ -142,7 +143,8 @@ private void doTakePhoto() {
      */
     private void editImageClick() {
         File outputFile = FileUtils.genEditFile();
-        EditImageActivity.start(this,path,outputFile.getAbsolutePath(),ACTION_REQUEST_EDITIMAGE);
+        savePath = outputFile.getAbsolutePath();
+        EditImageActivity.start(this,path,savePath,ACTION_REQUEST_EDITIMAGE);
     }
 
     /**
@@ -203,7 +205,7 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
                     handleTakePhoto(data);
                     break;
                 case ACTION_REQUEST_EDITIMAGE://
-                    handleEditorImage(data);
+                    handleEditorImage();
                     break;
             }// end switch
         }
@@ -222,23 +224,14 @@ private void handleTakePhoto(Intent data) {
         }
     }
 
-    private void handleEditorImage(Intent data) {
-        String newFilePath = data.getStringExtra(EditImageActivity.EXTRA_OUTPUT);
-        boolean isImageEdit = data.getBooleanExtra(EditImageActivity.IMAGE_IS_EDIT, false);
-
-        if (isImageEdit){
-            Toast.makeText(this, getString(R.string.save_path, newFilePath), Toast.LENGTH_LONG).show();
-        }else{//未编辑  还是用原来的图片
-            newFilePath = data.getParcelableExtra(EditImageActivity.FILE_PATH);;
-        }
-        //System.out.println("newFilePath---->" + newFilePath);
+    private void handleEditorImage() {
+        System.out.println("newFilePath---->" + savePath);
         //File file = new File(newFilePath);
         //System.out.println("newFilePath size ---->" + (file.length() / 1024)+"KB");
-        Log.d("image is edit", isImageEdit + "");
 
 
         LoadImageTask loadTask = new LoadImageTask();
-        loadTask.execute(getImageContentUri(this,new File(newFilePath)));
+        loadTask.execute(getImageContentUri(this,new File(savePath)));
     }
 
     private void handleSelectFromAblum(Intent data) {

imageeditlibrary/src/main/java/com/xinlan/imageeditlibrary/editimage/task/StickerTask.java

@@ -18,7 +18,6 @@
  * 贴图合成任务 抽象类
  */
 public abstract class StickerTask extends AsyncTask<Bitmap, Void, Bitmap> {
-    private Dialog dialog;
 
     private EditImageActivity mContext;
 
@@ -32,10 +31,6 @@ protected void onPreExecute() {
 
         if (mContext.isFinishing())
             return;
-
-        dialog = mContext.getLoadingDialog(mContext, R.string.image_editor_saving_image,
-                false);
-        dialog.show();
     }
 
     @Override
@@ -63,21 +58,18 @@ protected Bitmap doInBackground(Bitmap... params) {
     @Override
     protected void onCancelled() {
         super.onCancelled();
-        dialog.dismiss();
     }
 
     @TargetApi(Build.VERSION_CODES.HONEYCOMB)
     @Override
     protected void onCancelled(Bitmap result) {
         super.onCancelled(result);
-        dialog.dismiss();
     }
 
     @Override
     protected void onPostExecute(Bitmap result) {
         super.onPostExecute(result);
         onPostResult(result);
-        dialog.dismiss();
     }
 
     public abstract void handleImage(Canvas canvas, Matrix m);

imageeditlibrary/src/main/res/drawable/image_edit_click_ripple.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <solid android:color="@color/image_editor_main_backgroud" />
+    <corners android:radius="2dp" />
+</shape>

imageeditlibrary/src/main/res/drawable/image_edit_ripple.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:color="#ffffff"
+    tools:ignore="NewApi">
+    <item android:drawable="@drawable/image_edit_click_ripple"/>
+</ripple>