|
@@ -13,6 +13,7 @@ import com.usai.util.Network;
|
|
|
import com.usai.util.dbUtil;
|
|
import com.usai.util.dbUtil;
|
|
|
import com.usai.util.dbgUtil;
|
|
import com.usai.util.dbgUtil;
|
|
|
|
|
|
|
|
|
|
+import android.database.Cursor;
|
|
|
import android.graphics.Bitmap;
|
|
import android.graphics.Bitmap;
|
|
|
import android.graphics.BitmapFactory;
|
|
import android.graphics.BitmapFactory;
|
|
|
import android.media.ThumbnailUtils;
|
|
import android.media.ThumbnailUtils;
|
|
@@ -191,12 +192,38 @@ public class MainActivity extends AppCompatActivity
|
|
|
{
|
|
{
|
|
|
Log.i(TAG, "start system camera====================>");
|
|
Log.i(TAG, "start system camera====================>");
|
|
|
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT,
|
|
takePictureIntent.putExtra(MediaStore.EXTRA_OUTPUT,
|
|
|
- Uri.fromFile(photoFile));
|
|
|
|
|
|
|
+ getImageContentUri(this,photoFile)/*Uri.fromFile(photoFile)*/);
|
|
|
startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
|
|
startActivityForResult(takePictureIntent, REQUEST_TAKE_PHOTO);
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
|
|
+ private Uri getImageContentUri(Context context, File imageFile) {
|
|
|
|
|
+ String filePath = imageFile.getAbsolutePath();
|
|
|
|
|
+ Cursor cursor = context.getContentResolver().query(
|
|
|
|
|
+ MediaStore.Images.Media.EXTERNAL_CONTENT_URI,
|
|
|
|
|
+ new String[] { MediaStore.Images.Media._ID },
|
|
|
|
|
+ MediaStore.Images.Media.DATA + "=? ",
|
|
|
|
|
+ new String[] { filePath }, null);
|
|
|
|
|
+
|
|
|
|
|
+ if (cursor != null && cursor.moveToFirst()) {
|
|
|
|
|
+ int id = cursor.getInt(cursor
|
|
|
|
|
+ .getColumnIndex(MediaStore.MediaColumns._ID));
|
|
|
|
|
+ Uri baseUri = Uri.parse("content://media/external/images/media");
|
|
|
|
|
+ return Uri.withAppendedPath(baseUri, "" + id);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ if (imageFile.exists()) {
|
|
|
|
|
+ ContentValues values = new ContentValues();
|
|
|
|
|
+ values.put(MediaStore.Images.Media.DATA, filePath);
|
|
|
|
|
+ return context.getContentResolver().insert(
|
|
|
|
|
+ MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
|
|
|
|
|
+ } else {
|
|
|
|
|
+ return null;
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+ }
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
@Override
|
|
@Override
|
|
|
public boolean onKeyDown(int keyCode, KeyEvent event)
|
|
public boolean onKeyDown(int keyCode, KeyEvent event)
|
|
|
{
|
|
{
|