新增党员认证，红色方向盘，运单跳转逻辑优化

mylibrary/src/main/java/com/dahe/mylibrary/net/JsonInterceptor.java

@@ -49,7 +49,7 @@ public class JsonInterceptor implements Interceptor {
             JSONObject jsonObject = new JSONObject(responseBodyStr);
             String str = jsonObject.optString("data");
             int code = jsonObject.optInt("code");
-//            if (-1 == code) {
+//            if (500 == code) {
 //                jsonObject.put("data", new JSONObject());
 //                throw new ResultException();
 //            } else {
@@ -57,10 +57,9 @@ public class JsonInterceptor implements Interceptor {
 //                    jsonObject.put("data", new JSONObject());
 //                }
 //            }
-            if (code != 200) {
-                if (TextUtils.isEmpty(str)) {
-                    jsonObject.put("data", new String());
-                }
+
+            if (TextUtils.isEmpty(str)) {
+                jsonObject.put("data", new JSONObject());
             }
 
             String data = jsonObject.toString();

mylibrary/src/main/java/com/dahe/mylibrary/pop/PopBottomPic.kt

@@ -5,8 +5,6 @@ import android.widget.Button
 import com.dahe.mylibrary.R
 import com.dahe.mylibrary.adapter.GridImageAdapter
 import com.dahe.mylibrary.callback.OnPicResultListener
-import com.dahe.mylibrary.utils.SelectPicUtils
-import com.dahe.mylibrary.utils.ToastUtils
 import com.dahe.mylibrary.weight.GlideEngine
 import com.dahe.mylibrary.weight.ImageFileCompressEngine
 import com.luck.picture.lib.basic.PictureSelectionCameraModel
@@ -17,7 +15,7 @@ import com.luck.picture.lib.config.SelectModeConfig
 import com.luck.picture.lib.entity.LocalMedia
 import com.luck.picture.lib.interfaces.OnResultCallbackListener
 import com.lxj.xpopup.core.BottomPopupView
-import kotlin.math.min
+import kotlin.properties.Delegates
 
 /**
  * @ClassName PopBottomPic
@@ -27,6 +25,7 @@ import kotlin.math.min
  */
 class PopBottomPic(
     context: Context,
+    num: Int = 1,
     myAdapter: GridImageAdapter,
     onPicResultListener: OnPicResultListener
 ) : BottomPopupView(context) {
@@ -34,10 +33,12 @@ class PopBottomPic(
 
     private var listener: OnPicResultListener
     var myAdapter: GridImageAdapter
+    var num by Delegates.notNull<Int>()
 
     init {
         this.listener = onPicResultListener
         this.myAdapter = myAdapter
+        this.num = num
     }
 
 
@@ -91,7 +92,7 @@ class PopBottomPic(
                 .setCompressEngine(ImageFileCompressEngine())
                 .isPreviewImage(true)
                 .isMaxSelectEnabledMask(true)
-                .setMaxSelectNum(1)
+                .setMaxSelectNum(num)
                 .isGif(false)
                 .setSelectionMode(SelectModeConfig.SINGLE)
                 .setSelectedData(myAdapter.data)

mylibrary/src/main/java/com/dahe/mylibrary/utils/ActivityUtils.java

@@ -291,7 +291,7 @@ public class ActivityUtils {
      *
      * @param isIncludeSelf 是否结束该activity自己
      */
-    public static boolean finishToActivity(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,
+    public static boolean finishToActivityAndGoNew(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,
                                            final boolean isIncludeSelf) {
         List<Activity> activities = CommonBaseLibrary.activityList;
         for (int i = activities.size() - 1; i >= 0; --i) {
@@ -310,6 +310,30 @@ public class ActivityUtils {
         return false;
     }
 
+    /**
+     * 结束到指定Activity,并进入指定页面
+     *
+     * @param isIncludeSelf 是否结束该activity自己
+     */
+    public static boolean finishToActivityAndGoNew(Context ctx ,@NonNull final Class<?> clz,@NonNull final Class<?> newclz,Bundle bundle,
+                                                   final boolean isIncludeSelf) {
+        List<Activity> activities = CommonBaseLibrary.activityList;
+        for (int i = activities.size() - 1; i >= 0; --i) {
+            Activity aActivity = activities.get(i);
+            if (aActivity.getClass().equals(clz)) {
+                if (isIncludeSelf) {
+                    finishActivity(aActivity);
+                }
+                startActivity(ctx,newclz,bundle);
+                return true;
+            } else {
+                finishActivity(aActivity);
+            }
+//            finishActivity(aActivity);
+        }
+        return false;
+    }
+
     /**
      * 结束除最新之外的同类型Activity
      * <p>也就是让栈中最多只剩下一种类型的Activity</p>

mylibrary/src/main/java/com/dahe/mylibrary/utils/PopsUtils.kt

@@ -30,11 +30,25 @@ class PopsUtils private constructor(){
     fun showSelPic(ctx: Context,myAdapter: GridImageAdapter, listenter: OnPicResultListener){
         XPopup.Builder(ctx)
             .dismissOnTouchOutside(true)
-            .asCustom(PopBottomPic(ctx, myAdapter, listenter))
+            .asCustom(PopBottomPic(ctx,1, myAdapter, listenter))
             .show()
     }
 
 
+    /**
+     * 选择照片，并设置最大选中数量
+     *
+     * @param myAdapter
+     * @param listenter 结果回调
+     */
+    fun showNorSelPicAndNum(ctx: Context,num: Int = 1,myAdapter: GridImageAdapter, listenter: OnPicResultListener){
+//        XPopup.Builder(ctx)
+//            .dismissOnTouchOutside(true)
+//            .asCustom(PopNorBottomPic(ctx,1, myAdapter, listenter))
+//            .show()
+    }
+
+
     /**
      * 选择照片 拍照或者相机
      *