Parcourir la source

Compate Android 13

vbea il y a 2 ans
Parent
commit
c1d9cf172e

+ 3 - 2
Strides-APP/app/pages/payment/PayNow.js

@@ -11,6 +11,7 @@ import Dialog from '../../components/Dialog';
 import { Balance } from '../wallet/Payment';
 import {check, request, openSettings, PERMISSIONS, RESULTS} from 'react-native-permissions';
 import TextView from '../../components/TextView';
+import utils from '../../utils/utils';
 
 export default class PayNow extends Component {
   constructor(props) {
@@ -64,7 +65,7 @@ export default class PayNow extends Component {
     request(
       isIOS 
     ? PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY
-    : PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE)
+    : utils.getFilePermissionString())
     .then(res => {
       console.log('getPermission', res)
       this.checkPermission();
@@ -77,7 +78,7 @@ export default class PayNow extends Component {
     check(
       isIOS 
     ? PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY
-    : PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE)
+    : utils.getFilePermissionString())
     .then(res => {
       switch (res) {
         case RESULTS.UNAVAILABLE:

+ 3 - 2
Strides-APP/app/pages/payment/PayPerUse.js

@@ -9,6 +9,7 @@ import ViewShot from "react-native-view-shot";
 import Button from '../../components/Button';
 import Dialog from '../../components/Dialog';
 import {check, request, openSettings, PERMISSIONS, RESULTS} from 'react-native-permissions';
+import utils from '../../utils/utils';
 
 export default class PayPerUse extends Component {
   constructor(props) {
@@ -47,7 +48,7 @@ export default class PayPerUse extends Component {
     request(
       isIOS 
     ? PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY
-    : PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE)
+    : utils.getFilePermissionString())
     .then(res => {
       console.log('getPermission', res)
       this.checkPermission();
@@ -60,7 +61,7 @@ export default class PayPerUse extends Component {
     check(
       isIOS 
     ? PERMISSIONS.IOS.PHOTO_LIBRARY_ADD_ONLY
-    : PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE)
+    : utils.getFilePermissionString())
     .then(res => {
       switch (res) {
         case RESULTS.UNAVAILABLE:

+ 9 - 1
Strides-APP/app/utils/utils.js

@@ -1,8 +1,9 @@
-import { Linking } from "react-native";
+import { Linking, Platform } from "react-native";
 import { showLocation } from 'react-native-map-link'
 import { host } from '../api/http';
 import apiUser from "../api/apiUser";
 import { getStorageSync, setStorage } from "./storage";
+import { PERMISSIONS } from "react-native-permissions";
 
 /**
  * 工具集
@@ -295,5 +296,12 @@ export default {
     } else {
       return host + path;
     }
+  },
+  getFilePermissionString() {
+    if (Platform.Version >= 33) {
+      return PERMISSIONS.ANDROID.READ_MEDIA_IMAGES;
+    } else {
+      return PERMISSIONS.ANDROID.WRITE_EXTERNAL_STORAGE;
+    }
   }
 }

+ 1 - 1
Strides-APP/package.json

@@ -11,7 +11,7 @@
     "lint": "eslint .",
     "release": "npx react-native run-android --variant=release",
     "bundle": "cd android & ./gradlew bundleRelease",
-    "build:android": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/src/main/assets/index.android.bundle --assets-dest android/app/src/main/res/",
+    "build:android": "react-native bundle --platform android --dev false --entry-file index.js --bundle-output android/app/build/generated/assets/createBundleReleaseJsAndAssets/index.android.bundle --assets-dest android/app/build/generated/res/createBundleReleaseJsAndAssets/",
     "build:ios": "react-native bundle --platform ios --dev false --entry-file index.js --bundle-output ios/bundle/main.jsbundle --assets-dest ios/bundle ",
     "clean": "cd android & ./gradlew clean",
     "apk": "cd android & ./gradlew assembleRelease",