xiongzhu vor 2 Jahren
Ursprung
Commit
13396dbe08

+ 1 - 1
.eslintrc.cjs

@@ -17,5 +17,5 @@ module.exports = {
         tidioChatApi: true,
         $: true
     },
-    ignorePatterns: ['index.html']
+    ignorePatterns: ['index.html', 'public/error.html']
 }

BIN
android/app/src/main/assets/cdvasset.manifest


+ 1 - 1
android/capacitor.settings.gradle

@@ -60,4 +60,4 @@ include ':capacitor-codepush'
 project(':capacitor-codepush').projectDir = new File('../node_modules/capacitor-codepush/android')
 
 include ':capacitor-facebook'
-project(':capacitor-facebook').projectDir = new File('../node_modules/capacitor-facebook/android')
+project(':capacitor-facebook').projectDir = new File('../../../capacitor/capacitor-facebook/android')

+ 6 - 5
capacitor.config.json

@@ -2,7 +2,9 @@
     "appId": "com.bigauction.mobile",
     "appName": "FirstCash",
     "webDir": "dist",
-    "bundledWebRuntime": false,
+    "bundledWebRuntime": true,
+    "backgroundColor": "#1C1C1C",
+    "errorPath": "error.html",
     "android": {
         "buildOptions": {
             "keystorePath": "../zouma.jks",
@@ -13,6 +15,9 @@
         },
         "releaseType": "APK"
     },
+    "ios": {
+        "allowsLinkPreview": false
+    },
     "plugins": {
         "SplashScreen": {
             "launchAutoHide": false
@@ -22,9 +27,5 @@
             "ANDROID_DEPLOY_KEY": "ZrEsHcngd89oYtHZYQxLRUSMJ8trafzoNUVDN",
             "SERVER_URL": "https://codepush.appcenter.ms/"
         }
-    },
-    "server": {
-        "url": "http://192.168.6.215:5173/h5/",
-        "clearText": true
     }
 }

+ 1 - 1
ios/App/Podfile

@@ -30,7 +30,7 @@ def capacitor_pods
   pod 'CapacitorStatusBar', :path => '../../node_modules/@capacitor/status-bar'
   pod 'AppsflyerCapacitorPlugin', :path => '../../node_modules/appsflyer-capacitor-plugin'
   pod 'CapacitorCodepush', :path => '../../node_modules/capacitor-codepush'
-  pod 'CapacitorFacebook', :path => '../../node_modules/capacitor-facebook'
+  pod 'CapacitorFacebook', :path => '../../../../capacitor/capacitor-facebook'
 end
 
 target 'App' do

+ 1 - 1
package.json

@@ -39,7 +39,7 @@
     "appsflyer-capacitor-plugin": "^6.9.2",
     "axios": "^1.2.0",
     "capacitor-codepush": "https://github.com/x1ongzhu/capacitor-codepush.git",
-    "capacitor-facebook": "https://github.com/x1ongzhu/capacitor-facebook.git",
+    "capacitor-facebook": "link:/Users/drew/Projects/capacitor/capacitor-facebook",
     "cordova-plugin-android-notch": "^1.0.3",
     "date-fns": "^2.29.3",
     "eruda": "^2.6.1",

+ 17 - 0
public/error.html

@@ -0,0 +1,17 @@
+<!DOCTYPE html>
+<html lang="en">
+
+<head>
+    <meta charset="UTF-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>ERROR</title>
+    <script src="capacitor.js"></script>
+</head>
+
+<body>
+    <h3>Please Upgrade Android System WebView</h3>
+    <h4>Your Webview version is not longger supported</h4>
+</body>
+
+</html>

+ 0 - 1
src/App.vue

@@ -25,7 +25,6 @@ const ionRouter = useIonRouter()
 const route = useRoute()
 
 const promptLogin = async () => {
-    console.log('onpromptLogin')
     const confirm = await showConfirmDialog({
         title: t('common.alert'),
         message: t('user.notLogin')

+ 3 - 4
src/main.js

@@ -151,7 +151,7 @@ document.addEventListener('deviceready', () => {
             codePush
                 .sync(
                     {
-                        updateDialog: true,
+                        updateDialog: false,
                         installMode: InstallMode.IMMEDIATE,
                         ignoreFailedUpdates: false
                     },
@@ -181,11 +181,10 @@ document.addEventListener('deviceready', () => {
         })
     }
 })
-Facebook.init({ appId: '683776590201632' }).then(() => {
-    console.log('Facebook init success')
+Facebook.init({ appId: '683776590201632', pixelId: '557748303040652' }).then(() => {
+    console.log('FacebookSDK initialized')
 })
 
 if (useStorage('showConsole', 0).value > new Date().getTime()) {
     initEruda()
 }
-console.log(8)

+ 1 - 6
src/views/SettingPage.vue

@@ -66,12 +66,7 @@
                 <van-cell-group inset>
                     <van-cell :title="$t('mine.bindPhone')" class="not" :value="(user || {}).phone"> </van-cell>
                     <!-- <van-cell title="修改密码" is-link></van-cell> -->
-                    <van-cell
-                        class="not"
-                        :title="`${$t('mine.user')}ID`"
-                        :value="(user || {}).id"
-                        @click="showConsoleEve"
-                    />
+                    <van-cell class="not" :title="`${$t('mine.user')}ID`" :value="(user || {}).id" />
                 </van-cell-group>
 
                 <!-- <van-cell-group :border="false">

+ 3 - 3
yarn.lock

@@ -2079,9 +2079,9 @@ caniuse-lite@^1.0.30001400:
   dependencies:
     code-push "^4.0.2"
 
-"capacitor-facebook@https://github.com/x1ongzhu/capacitor-facebook.git":
-  version "0.0.1"
-  resolved "https://github.com/x1ongzhu/capacitor-facebook.git#607b440cf855ac95b69e0b8793072c0b389771f6"
+"capacitor-facebook@link:/Users/drew/Projects/capacitor/capacitor-facebook":
+  version "0.0.0"
+  uid ""
 
 caw@^2.0.0, caw@^2.0.1:
   version "2.0.1"