Skip to content

陈岩 / CvaYap-app

Go to a project
Commit f968813b by 陈岩
Options

fix: 修复相册权限问题

1 parent a368866a
Inline Side-by-side
Showing 3 changed files with 33 additions and 32 deletions
manifest.json
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
"name" : "CVA YAP", "name" : "CVA YAP",
"appid" : "__UNI__C2F3380", "appid" : "__UNI__C2F3380",
"description" : "", "description" : "",
"versionName" : "1.0.18", "versionName" : "1.0.19",
"versionCode" : 28, "versionCode" : 29,
"transformPx" : false, "transformPx" : false,
/* h5代理方式 */ /* h5代理方式 */
"h5" : { "h5" : {
...@@ -45,7 +45,8 @@ ...@@ -45,7 +45,8 @@
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules" : {
"File" : {}, "File" : {},
"Push" : {} "Push" : {},
"Camera" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {
...@@ -103,7 +104,8 @@ ...@@ -103,7 +104,8 @@
/* 模块配置 */ /* 模块配置 */
"modules" : { "modules" : {
"File" : {}, "File" : {},
"Push" : {} "Push" : {},
"Camera" : {}
}, },
/* 应用发布信息 */ /* 应用发布信息 */
"distribute" : { "distribute" : {
......
uni_modules/uv-upload/components/uv-upload/plusUpload.js
...@@ -110,22 +110,19 @@ async function chooseImageAction() { ...@@ -110,22 +110,19 @@ async function chooseImageAction() {
return new Promise((resolve, reject) => { return new Promise((resolve, reject) => {
const imgI18nMap = { const imgI18nMap = {
'zh_CN':{ 'zh_CN':{
takePhoto:'拍照', takePhoto:'拍照'
gallery:'从图库中选择'
}, },
'en_US':{ 'en_US':{
takePhoto:'Take photo', takePhoto:'Take photo'
gallery:'Choose from gallery'
}, },
'ja_JP':{ 'ja_JP':{
takePhoto:'カメラで撮る', takePhoto:'カメラで撮る'
gallery:'ギャラリーから選択'
} }
} }
const lang = uni.getStorageSync('lang') || 'en_US' const lang = uni.getStorageSync('lang') || 'en_US'
uni.showActionSheet({ uni.showActionSheet({
itemList: [imgI18nMap[lang].takePhoto, imgI18nMap[lang].gallery], itemList: [imgI18nMap[lang].takePhoto],
success: (res) => resolve(res.tapIndex === 0 ? 'camera' : 'album'), success: (res) => resolve('camera'),
fail: (err) => reject(err) fail: (err) => reject(err)
}); });
}); });
...@@ -138,13 +135,18 @@ async function chooseImageAction() { ...@@ -138,13 +135,18 @@ async function chooseImageAction() {
*/ */
export async function chooseImage(options = {}) { export async function chooseImage(options = {}) {
const source = options.source; const source = options.source;
const count = options.count ?? 1; // const count = options.count ?? 1;
const sizeType = options.sizeType || ['original', 'compressed']; // const sizeType = options.sizeType || ['original', 'compressed'];
const sourceType = options.sourceType || ['album', 'camera']; // const sourceType = options.sourceType || ['album', 'camera'];
const count = 1;
const sizeType = ['compressed']
const sourceType = ['camera'];
try { try {
const finalSource = source ?? (await chooseImageAction()); const finalSource = source ?? (await chooseImageAction());
const paths = finalSource === 'camera' ? await takePhoto() : await pickFromGallery(); // finalSource === 'camera' ? : await pickFromGallery();
const paths = await takePhoto()
if (!paths || paths.length === 0) { if (!paths || paths.length === 0) {
return { return {
......
uni_modules/uv-upload/components/uv-upload/utils.js
import { import {
chooseImagePath as chooseImage chooseImagePath as chooseImage
} from './plusUpload.js' } from './plusUpload.js'
import {
chooseSystemMedia
} from "@/uni_modules/uni-chooseSystemImage"
function pickExclude(obj, keys) { function pickExclude(obj, keys) {
// 某些情况下，type可能会为 // 某些情况下，type可能会为
...@@ -89,20 +86,20 @@ export function chooseFile({ ...@@ -89,20 +86,20 @@ export function chooseFile({
case 'image': case 'image':
const isAndroid = isAndroidApp() const isAndroid = isAndroidApp()
if (isAndroid) { if (isAndroid) {
chooseSystemMedia({ // chooseSystemMedia({
count: 2, // count: 2,
mediaType: ['image'], // mediaType: ['image'],
pageOrientation: "portrait", // pageOrientation: "portrait",
success: (e) => { // success: (e) => {
console.log(e.filePaths) // console.log(e.filePaths)
}, // },
fail: (e) => { // fail: (e) => {
console.log(e) // console.log(e)
}, // },
})
// chooseImage().then(res => {
// resolve(formatImage(res))
// }) // })
chooseImage().then(res => {
resolve(formatImage(res))
})
} else { } else {
uni.chooseImage({ uni.chooseImage({
count: multiple ? Math.min(maxCount, 9) : 1, count: multiple ? Math.min(maxCount, 9) : 1,
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!