luanxuye 5 年 前
コミット
6fbf5987ed

+ 9 - 2
base_library/src/main/java/com/mgtech/base_library/activityUtils/CameraDialogActivity.java

@@ -8,6 +8,7 @@ import android.widget.LinearLayout;
 
 import androidx.annotation.NonNull;
 
+import com.alibaba.android.arouter.facade.annotation.Autowired;
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.luck.picture.lib.PictureSelector;
 import com.luck.picture.lib.config.PictureConfig;
@@ -44,6 +45,12 @@ import static com.mgtech.base_library.router.RouterURLS.BASE_CAMERA_DIALOG_URL;
  */
 @Route(path = BASE_CAMERA_DIALOG_URL)
 public class CameraDialogActivity extends BaseActivity {
+    @Autowired(name="num")//图片个数
+    int num ;
+    @Autowired(name="x")//裁剪比例 x
+    int numX ;
+    @Autowired(name="y")//裁剪比例 y
+    int numY ;
     private boolean isCamera;
 
     @Override
@@ -99,11 +106,11 @@ public class CameraDialogActivity extends BaseActivity {
                 //相册
                 PictureSelector.create(this)
                         .openGallery(PictureMimeType.ofImage())
-                        .maxSelectNum(5) //最大个数
+                        .maxSelectNum(num==0?5:num) //最大个数(默认5)
                         .minSelectNum(1)//最小个数
                         .imageSpanCount(4)//每行显示的个数
                         .isEnableCrop(true) //是否裁剪
-                        .withAspectRatio(1, 1)//裁剪比例1:1
+                        .withAspectRatio(numX==0?1:numX, numY==0?1:numY)//裁剪比例1:1(默认)
                         .isCompress(true)//是否压缩
                         .isCamera(false) //是否显示拍照按钮
                         .isPreviewImage(true)

+ 1 - 1
base_library/src/main/java/com/mgtech/base_library/http/common/HttpConfig.java

@@ -22,7 +22,7 @@ public class HttpConfig {
 //    public static final String BASE_URL = "http://172.14.1.61:9400/"; //测试
 //    public static final String BASE_URL = "http://api.basss.pj.dl-cg.com/";//大连环境
 //    public static final String BASE_URL = "https://api.d.ulestyle.com/";//上海
-//    public static final String BASE_URL = "http://172.14.3.33:9400/";//本地
+//    public static final String BASE_URL = "http://172.14.1.61:20010/";//本地
 
     public static final String BASE_URL = TextUtils.equals("release", BuildConfig.BUILD_TYPE)
             ? "https://api.d.ulestyle.com/" : (TextUtils.equals("debug",BuildConfig.BUILD_TYPE)