fix not give image after corp

Qixingchen · Dec 27, 2016 · b267e2a · b267e2a
1 parent 5b31f6b
commit b267e2a
Show file tree

Hide file tree

Showing 5 changed files with 54 additions and 17 deletions.
diff --git a/app/src/main/java/moe/xing/getimage_app/MainActivity.java b/app/src/main/java/moe/xing/getimage_app/MainActivity.java
@@ -11,7 +11,6 @@
 import java.io.File;
 
 import moe.xing.baseutils.Init;
-import moe.xing.getimage.BuildConfig;
 import moe.xing.getimage.RxGetImage;
 import moe.xing.getimage_app.databinding.ActivityMainBinding;
 import rx.Subscriber;
@@ -24,14 +23,37 @@ public class MainActivity extends AppCompatActivity {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        Init.getInstance(getApplication(), BuildConfig.DEBUG, "1", "");
+        Init.getInstance(getApplication(), true, "1", "");
         mBinding = DataBindingUtil.inflate(LayoutInflater.from(this), R.layout.activity_main, null, false);
         setContentView(mBinding.getRoot());
 
         mAdapter = new ImageAdapter();
         mBinding.recyclerView.setLayoutManager(new GridLayoutManager(this, 3));
         mBinding.recyclerView.setAdapter(mAdapter);
 
+        mBinding.singleCorp.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(final View v) {
+                RxGetImage.getInstance().getImage(RxGetImage.MODE_SINGLE_AND_CORP).subscribe(new Subscriber<File>() {
+                    @Override
+                    public void onCompleted() {
+                        Toast.makeText(v.getContext(), "complete", Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onError(Throwable e) {
+                        Toast.makeText(v.getContext(), e.getLocalizedMessage(), Toast.LENGTH_SHORT).show();
+                    }
+
+                    @Override
+                    public void onNext(File file) {
+                        mAdapter.addData(file);
+                    }
+                });
+
+            }
+        });
+
         mBinding.single.setOnClickListener(new View.OnClickListener() {
             @Override
             public void onClick(final View v) {

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -12,17 +12,32 @@
         android:layout_height="match_parent"
         android:orientation="vertical">
 
-        <Button
-            android:id="@+id/single"
-            android:layout_width="wrap_content"
+        <LinearLayout
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:text="获取单张图"/>
+            android:orientation="horizontal">
+
+            <Button
+                android:id="@+id/single"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="获取单张图"/>
+
+            <Button
+                android:id="@+id/single_corp"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="获取单张图并裁剪"/>
+
+            <Button
+                android:id="@+id/multiple"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="获取多图"/>
+
+
+        </LinearLayout>
 
-        <Button
-            android:id="@+id/multiple"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:text="获取多图"/>
 
         <android.support.v7.widget.RecyclerView
             android:id="@+id/recycler_view"

diff --git a/build.gradle b/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.2'
+        classpath 'com.android.tools.build:gradle:2.3.0-beta1'
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5'
         classpath 'org.kt3k.gradle.plugin:coveralls-gradle-plugin:2.4.0'
         classpath 'com.vanniktech:gradle-android-junit-jacoco-plugin:0.5.0'

diff --git a/lib/src/main/AndroidManifest.xml b/lib/src/main/AndroidManifest.xml
@@ -8,6 +8,8 @@
             android:launchMode="singleTop"
             android:theme="@android:style/Theme.Translucent.NoTitleBar"/>
 
+        <activity android:name="com.soundcloud.android.crop.CropImageActivity"/>
+
     </application>
 
 </manifest>
diff --git a/lib/src/main/java/moe/xing/getimage/GetImageActivity.java b/lib/src/main/java/moe/xing/getimage/GetImageActivity.java
@@ -33,9 +33,9 @@
 
 public class GetImageActivity extends Activity {
 
-    private static final int SELECT_PHOTO = 1;
-    private static final int TAKE_PHOTO = 2;
-    private static final int CORP_PHOTO = 3;
+    private static final int SELECT_PHOTO = 10;
+    private static final int TAKE_PHOTO = 20;
+    private static final int CORP_PHOTO = 30;
     private static final String SUBSCRIBER_ID = "SubscriberID";
     private static final String SELECT_MODE = "select_mode";
     private static final String MAX_SIZE = "max_size";
@@ -83,7 +83,6 @@ private void doSelect() {
 
     @Override
     public void onActivityResult(int requestCode, int resultCode, Intent data) {
-
         if (resultCode == Activity.RESULT_OK) {
             switch (requestCode) {
                 case SELECT_PHOTO:
@@ -203,7 +202,6 @@ private void getSingleImage(Uri uri) {
                 .subscribe(new Subscriber<File>() {
                     @Override
                     public void onCompleted() {
-                        finish();
                     }
 
                     @Override