commit

zlongxiao · Jan 6, 2020 · 02a44b8 · 02a44b8
1 parent 54aec7b
commit 02a44b8
Show file tree

Hide file tree

Showing 20 changed files with 3,102 additions and 8 deletions.
diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
diff --git a/.idea/caches/gradle_models.ser b/.idea/caches/gradle_models.ser
diff --git a/app/src/main/java/com/luck/pictureselector/MainActivity.java b/app/src/main/java/com/luck/pictureselector/MainActivity.java
@@ -67,7 +67,7 @@ public class MainActivity extends AppCompatActivity implements View.OnClickListe
     private CheckBox cb_voice, cb_choose_mode, cb_isCamera, cb_isGif,
             cb_preview_img, cb_preview_video, cb_crop, cb_compress,
             cb_mode, cb_hide, cb_crop_circular, cb_styleCrop, cb_showCropGrid,
-            cb_showCropFrame, cb_preview_audio, cb_original, cb_single_back;
+            cb_showCropFrame, cb_preview_audio, cb_original, cb_single_back, cb_custom_camera;
     private int themeId;
     private int chooseMode = PictureMimeType.ofAll();
     private boolean isWeChatStyle;
@@ -111,6 +111,7 @@ protected void onCreate(Bundle savedInstanceState) {
         cb_preview_audio = findViewById(R.id.cb_preview_audio);
         cb_original = findViewById(R.id.cb_original);
         cb_single_back = findViewById(R.id.cb_single_back);
+        cb_custom_camera = findViewById(R.id.cb_custom_camera);
         cb_hide = findViewById(R.id.cb_hide);
         cb_crop_circular = findViewById(R.id.cb_crop_circular);
         rgb_crop.setOnCheckedChangeListener(this);
@@ -205,7 +206,7 @@ public void onAddPicClick() {
                         .loadImageEngine(GlideEngine.createGlideEngine())// 外部传入图片加载引擎，必传项
                         .theme(themeId)// 主题样式设置 具体参考 values/styles   用法：R.style.picture.white.style v2.3.3后 建议使用setPictureStyle()动态方式
                         .isWeChatStyle(isWeChatStyle)// 是否开启微信图片选择风格
-                        .isUseCustomCamera(false)// 是否使用自定义相机
+                        .isUseCustomCamera(cb_custom_camera.isChecked())// 是否使用自定义相机
                         .setLanguage(language)// 设置语言，默认中文
                         .setPictureStyle(mPictureParameterStyle)// 动态自定义相册主题
                         .setPictureCropStyle(mCropParameterStyle)// 动态自定义裁剪主题
@@ -279,7 +280,7 @@ public void onAddPicClick() {
                         .setPictureCropStyle(mCropParameterStyle)// 动态自定义裁剪主题
                         .setPictureWindowAnimationStyle(windowAnimationStyle)// 自定义相册启动退出动画
                         .maxSelectNum(maxSelectNum)// 最大图片选择数量
-                        .isUseCustomCamera(false)// 是否使用自定义相机
+                        .isUseCustomCamera(cb_custom_camera.isChecked())// 是否使用自定义相机
                         .minSelectNum(1)// 最小选择数量
                         //.querySpecifiedFormatSuffix(PictureMimeType.ofPNG())// 查询指定后缀格式资源
                         .selectionMode(cb_choose_mode.isChecked() ?

diff --git a/app/src/main/java/com/luck/pictureselector/PhotoFragment.java b/app/src/main/java/com/luck/pictureselector/PhotoFragment.java
@@ -73,7 +73,7 @@ public class PhotoFragment extends Fragment implements View.OnClickListener,
     private CheckBox cb_voice, cb_choose_mode, cb_isCamera, cb_isGif,
             cb_preview_img, cb_preview_video, cb_crop, cb_compress,
             cb_mode, cb_hide, cb_crop_circular, cb_styleCrop, cb_showCropGrid,
-            cb_showCropFrame, cb_preview_audio, cb_original, cb_single_back;
+            cb_showCropFrame, cb_preview_audio, cb_original, cb_single_back, cb_custom_camera;
     private int themeId;
     private int chooseMode = PictureMimeType.ofAll();
     private boolean isWeChatStyle;
@@ -127,6 +127,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat
         cb_preview_audio = view.findViewById(R.id.cb_preview_audio);
         cb_original = view.findViewById(R.id.cb_original);
         cb_single_back = view.findViewById(R.id.cb_single_back);
+        cb_custom_camera = view.findViewById(R.id.cb_custom_camera);
         cb_hide = view.findViewById(R.id.cb_hide);
         cb_crop_circular = view.findViewById(R.id.cb_crop_circular);
         rgb_crop.setOnCheckedChangeListener(this);
@@ -216,6 +217,7 @@ public void onAddPicClick() {
                         .loadImageEngine(GlideEngine.createGlideEngine())// 外部传入图片加载引擎，必传项
                         .theme(themeId)// 主题样式设置 具体参考 values/styles   用法：R.style.picture.white.style v2.3.3后 建议使用setPictureStyle()动态方式
                         .isWeChatStyle(isWeChatStyle)// 是否开启微信图片选择风格
+                        .isUseCustomCamera(cb_custom_camera.isChecked())// 是否使用自定义相机
                         .setLanguage(language)// 设置语言，默认中文
                         .setPictureStyle(mPictureParameterStyle)// 动态自定义相册主题
                         .setPictureCropStyle(mCropParameterStyle)// 动态自定义裁剪主题
@@ -290,6 +292,7 @@ public void onAddPicClick() {
                         .setPictureWindowAnimationStyle(windowAnimationStyle)// 自定义相册启动退出动画
                         .maxSelectNum(maxSelectNum)// 最大图片选择数量
                         .minSelectNum(1)// 最小选择数量
+                        .isUseCustomCamera(cb_custom_camera.isChecked())// 是否使用自定义相机
                         //.querySpecifiedFormatSuffix(PictureMimeType.ofPNG())// 查询指定后缀格式资源
                         .selectionMode(cb_choose_mode.isChecked() ?
                                 PictureConfig.MULTIPLE : PictureConfig.SINGLE)// 多选 or 单选

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
@@ -171,6 +171,15 @@
                 android:textSize="10dp"
                 android:visibility="gone" />
 
+            <CheckBox
+                android:id="@+id/cb_custom_camera"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:gravity="center_vertical"
+                android:text="使用自定义相机"
+                android:textColor="@color/app_color_53575e"
+                android:textSize="14sp" />
+
             <RadioGroup
                 android:id="@+id/rgb_langue"
                 android:layout_width="match_parent"

diff --git a/config.gradle b/config.gradle
@@ -16,6 +16,8 @@ ext {
 
 
             camerax_version      : "1.0.0-alpha08",
-            camerax_view_version : "1.0.0-alpha05"
+            camerax_view_version : "1.0.0-alpha05",
+            futures_version      : "1.0.0-rc01",
+            lifecycle_version    : "1.0.0-alpha01"
     ]
 }
diff --git a/picture_library/build.gradle b/picture_library/build.gradle
@@ -30,9 +30,8 @@ dependencies {
     implementation "androidx.appcompat:appcompat:${cfgs.version_appcompat}"
     //noinspection GradleCompatible
     implementation "androidx.recyclerview:recyclerview:${cfgs.version_recyclerview}"
-
+    implementation "androidx.concurrent:concurrent-futures:${cfgs.futures_version}"
+    implementation "androidx.camera:camera-lifecycle:${cfgs.lifecycle_version}"
     api "androidx.camera:camera-core:${cfgs.camerax_version}"
     api "androidx.camera:camera-camera2:${cfgs.camerax_version}"
-    api "androidx.camera:camera-view:${cfgs.camerax_view_version}"
-
 }