新增单独拍照功能

wangyazhou · Mar 21, 2017 · 17b6f28 · 17b6f28
1 parent ddd81c7
commit 17b6f28
Show file tree

Hide file tree

Showing 5 changed files with 92 additions and 9 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -15,7 +15,6 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <provider
             android:name="android.support.v4.content.FileProvider"
             android:authorities="${applicationId}.provider"
@@ -35,7 +34,7 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
+        <activity android:name=".BaseActivity"></activity>
     </application>
 
 </manifest>
diff --git a/app/src/main/java/com/luck/pictureselector/BaseActivity.java b/app/src/main/java/com/luck/pictureselector/BaseActivity.java
@@ -0,0 +1,72 @@
+package com.luck.pictureselector;
+
+import android.content.pm.PackageManager;
+import android.os.Bundle;
+import android.support.annotation.NonNull;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
+import android.support.v7.app.AppCompatActivity;
+import android.widget.Toast;
+
+import com.luck.picture.lib.model.FunctionConfig;
+
+public class BaseActivity extends AppCompatActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_base);
+
+    }
+
+    /**
+     * 针对6.0动态请求权限问题
+     * 判断是否允许此权限
+     *
+     * @param permissions
+     * @return
+     */
+    protected boolean hasPermission(String... permissions) {
+        for (String permission : permissions) {
+            if (ContextCompat.checkSelfPermission(this, permission)
+                    != PackageManager.PERMISSION_GRANTED) {
+                return false;
+            }
+        }
+        return true;
+    }
+
+    /**
+     * 动态请求权限
+     *
+     * @param code
+     * @param permissions
+     */
+    protected void requestPermission(int code, String... permissions) {
+        ActivityCompat.requestPermissions(this, permissions, code);
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        switch (requestCode) {
+            case FunctionConfig.CAMERA:
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED) {
+                    startCamera();
+                } else {
+                    showToast("拍照权限已被拒绝");
+                }
+                break;
+        }
+    }
+
+    /**
+     * 启动相机
+     */
+    protected void startCamera() {
+
+    }
+
+    protected void showToast(String msg) {
+        Toast.makeText(BaseActivity.this, msg, Toast.LENGTH_LONG).show();
+    }
+}
diff --git a/app/src/main/java/com/luck/pictureselector/MainActivity.java b/app/src/main/java/com/luck/pictureselector/MainActivity.java
@@ -1,6 +1,5 @@
 package com.luck.pictureselector;
 
-import android.app.Activity;
 import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.content.ContextCompat;
@@ -19,6 +18,7 @@
 import com.luck.pictureselector.adapter.GridImageAdapter;
 import com.luck.pictureselector.util.FullyGridLayoutManager;
 import com.yalantis.ucrop.entity.LocalMedia;
+
 import java.util.ArrayList;
 import java.util.List;
 
@@ -30,8 +30,8 @@
  * data：16/12/31
  */
 
-public class MainActivity extends Activity implements RadioGroup.OnCheckedChangeListener {
-
+public class MainActivity extends BaseActivity implements RadioGroup.OnCheckedChangeListener {
+    public static final String TAG = "MainActivity";
     private RecyclerView recyclerView;
     private GridImageAdapter adapter;
     private RadioGroup rgbs01, rgbs0, rgbs1, rgbs2, rgbs3, rgbs4, rgbs5, rgbs6, rgbs7, rgbs8, rgbs9, rgbs10;
@@ -130,12 +130,12 @@ public void onItemClick(int position, View v) {
             }
         });
 
-
     }
 
     /**
      * 删除图片回调接口
      */
+
     private GridImageAdapter.onAddPicClickListener onAddPicClickListener = new GridImageAdapter.onAddPicClickListener() {
         @Override
         public void onAddPicClick(int type, int position) {
@@ -228,6 +228,8 @@ public void onAddPicClick(int type, int position) {
                     PictureConfig.init(config);
                     PictureConfig.getPictureConfig().openPhoto(mContext, resultCallback);
 
+                    // 只拍照
+                    //PictureConfig.getPictureConfig().startOpenCamera(mContext, resultCallback);
                     break;
                 case 1:
                     // 删除图片
@@ -238,6 +240,7 @@ public void onAddPicClick(int type, int position) {
         }
     };
 
+
     /**
      * 图片回调方法
      */

diff --git a/app/src/main/java/com/luck/pictureselector/adapter/GridImageAdapter.java b/app/src/main/java/com/luck/pictureselector/adapter/GridImageAdapter.java
@@ -1,7 +1,6 @@
 package com.luck.pictureselector.adapter;
 
 import android.content.Context;
-import android.graphics.Bitmap;
 import android.support.v7.widget.RecyclerView;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -12,8 +11,6 @@
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
-import com.bumptech.glide.request.animation.GlideAnimation;
-import com.bumptech.glide.request.target.SimpleTarget;
 import com.luck.pictureselector.R;
 import com.yalantis.ucrop.entity.LocalMedia;
 
@@ -168,6 +165,9 @@ public void onClick(View view) {
                 case 2:
                     // 视频
                     Glide.with(mContext).load(path).thumbnail(0.5f).into(viewHolder.mImg);
+                    break;
+                default:
+
                     break;
             }
 

diff --git a/app/src/main/res/layout/activity_base.xml b/app/src/main/res/layout/activity_base.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context="com.luck.pictureselector.BaseActivity">
+
+</android.support.constraint.ConstraintLayout>