Browse Source

fix: Android支付宝支付修复+icon统一

zbb 1 tháng trước cách đây
mục cha
commit
c64e937400

+ 4 - 5
app.json

@@ -21,14 +21,13 @@
     },
     "android": {
       "adaptiveIcon": {
-        "backgroundColor": "#E6F4FE",
-        "foregroundImage": "./assets/images/android-icon-foreground.png",
-        "backgroundImage": "./assets/images/android-icon-background.png",
-        "monochromeImage": "./assets/images/android-icon-monochrome.png"
+        "backgroundColor": "#1a1a2e",
+        "foregroundImage": "./assets/images/icon.png"
       },
       "edgeToEdgeEnabled": true,
       "predictiveBackGestureEnabled": false,
-      "package": "com.acetoys"
+      "package": "com.acetoys",
+      "versionCode": 102
     },
     "web": {
       "output": "static",

+ 3 - 1
app/award-detail/components/CheckoutModal.tsx

@@ -12,6 +12,7 @@ import {
     AppState,
     Dimensions,
     Modal,
+    Platform,
     ScrollView,
     StyleSheet,
     Text,
@@ -295,7 +296,8 @@ export const CheckoutModal = forwardRef<CheckoutModalRef, CheckoutModalProps>(
         let pollingStarted = false;
 
         try {
-          Alipay.setAlipayScheme("alipay2021005175632205");
+          if (Platform.OS === "ios")
+            Alipay.setAlipayScheme("alipay2021005175632205");
 
           // Watch for app returning to foreground as a fallback
           appStateSub = AppState.addEventListener(

+ 2 - 1
app/cloud-warehouse/components/CheckoutModal.tsx

@@ -149,7 +149,8 @@ export default function CheckoutModal({
         let isResolved = false;
 
         try {
-          Alipay.setAlipayScheme("alipay2021005175632205");
+          if (Platform.OS === "ios")
+            Alipay.setAlipayScheme("alipay2021005175632205");
 
           appStateSub = AppState.addEventListener(
             "change",

+ 2 - 1
app/store/components/CheckoutModal.tsx

@@ -148,7 +148,8 @@ export default function CheckoutModal({
         let isResolved = false;
 
         try {
-          Alipay.setAlipayScheme("alipay2021005175632205");
+          if (Platform.OS === "ios")
+            Alipay.setAlipayScheme("alipay2021005175632205");
 
           appStateSub = AppState.addEventListener(
             "change",

+ 19 - 17
app/treasure-hunt/components/CheckoutModal.tsx

@@ -1,29 +1,30 @@
 import { Image } from "expo-image";
 import { useRouter } from "expo-router";
 import React, {
-  forwardRef,
-  useImperativeHandle,
-  useRef,
-  useState,
+    forwardRef,
+    useImperativeHandle,
+    useRef,
+    useState,
 } from "react";
 import {
-  ActivityIndicator,
-  Alert,
-  AppState,
-  Dimensions,
-  Modal,
-  ScrollView,
-  StyleSheet,
-  Text,
-  TouchableOpacity,
-  View,
+    ActivityIndicator,
+    Alert,
+    AppState,
+    Dimensions,
+    Modal,
+    Platform,
+    ScrollView,
+    StyleSheet,
+    Text,
+    TouchableOpacity,
+    View,
 } from "react-native";
 
 import { applyOrder, getApplyResult, previewOrder } from "@/services/award";
 import Alipay from "expo-native-alipay";
 import {
-  LotteryResultModal,
-  LotteryResultModalRef,
+    LotteryResultModal,
+    LotteryResultModalRef,
 } from "./LotteryResultModal";
 
 const { width: SCREEN_WIDTH } = Dimensions.get("window");
@@ -295,7 +296,8 @@ export const CheckoutModal = forwardRef<CheckoutModalRef, CheckoutModalProps>(
         let pollingStarted = false;
 
         try {
-          Alipay.setAlipayScheme("alipay2021005175632205");
+          if (Platform.OS === "ios")
+            Alipay.setAlipayScheme("alipay2021005175632205");
 
           // Watch for app returning to foreground as a fallback
           appStateSub = AppState.addEventListener(

+ 11 - 11
eas.json

@@ -1,21 +1,21 @@
 {
   "cli": {
-    "version": ">= 7.0.0"
+    "version": ">= 3.0.0"
   },
   "build": {
-    "development": {
-      "node": "18.18.0",
-      "developmentClient": true,
-      "distribution": "internal"
-    },
-    "preview": {
-      "distribution": "internal"
-    },
     "production": {
-      "distribution": "store"
+      "ios": {},
+      "android": {
+        "buildType": "apk",
+        "credentialsSource": "local"
+      }
     }
   },
   "submit": {
-    "production": {}
+    "production": {
+      "ios": {
+        "ascAppId": "6758643184"
+      }
+    }
   }
 }