'合并代码'

Author: ablockhead

.idea/caches/build_file_checksums.ser

@@ -9,7 +9,7 @@ ext {
             ucropVersionCode     : 22,
             ucropVersionName     : "2.2.0-native",
 
-            //open version control
+            //open version controlandroidSupportVersion
             androidSupportVersion: "27.1.1",
             glide                : "4.5.0",
             rxjava               : "2.0.5",

.idea/caches/gradle_models.ser

@@ -178,8 +178,10 @@ private void initData() {
 
     @Override
     public void onClick(int position) {
+        System.out.println("<<<<<<<<<<<<<<<<position"+position);
         if(cutIndex != position && maxClick+1 >= position ){
             maxClick = maxClick+1 == position ? position:maxClick;
+            System.out.println("<<<<<<<<<<<<<<<<maxClick"+maxClick);
             this.position = position;
             cropAndSaveImage();
             is_user_position = true;
@@ -747,6 +749,7 @@ public void onCropFailure(@NonNull Throwable t) {
 
 
     protected void setResultUri(Uri uri, float resultAspectRatio, int offsetX, int offsetY, int imageWidth, int imageHeight) {
+        System.out.println("<<<<<<<<<<<<<<<<"+maxClick);
         try {
             CutInfo info = cutInfos.get(cutIndex);
             info.setCutPath(uri.getPath());
@@ -757,6 +760,7 @@ protected void setResultUri(Uri uri, float resultAspectRatio, int offsetX, int o
             info.setImageWidth(imageWidth);
             info.setImageHeight(imageHeight);
             cutIndex = is_user_position ? position: cutIndex + 1;
+            maxClick = is_user_position ? maxClick: maxClick+1;
             maxClick = maxClick < cutIndex ? maxClick+1:maxClick;
             if (maxClick >= cutInfos.size()) {
                 setResult(RESULT_OK, new Intent().putExtra(UCropMulti.EXTRA_OUTPUT_URI_LIST, (Serializable) cutInfos));