xiongzhu 2 anni fa
parent
commit
0cf902896f

+ 1 - 1
android/app/build.gradle

@@ -6,7 +6,7 @@ android {
         applicationId "com.bigauction.mobile"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 34
+        versionCode 36
         versionName "1.0.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {

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


+ 2 - 2
ios/App/App.xcodeproj/project.pbxproj

@@ -352,7 +352,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 36;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				INFOPLIST_FILE = App/Info.plist;
@@ -377,7 +377,7 @@
 				CLANG_ALLOW_NON_MODULAR_INCLUDES_IN_FRAMEWORK_MODULES = NO;
 				CODE_SIGN_ENTITLEMENTS = App/App.entitlements;
 				CODE_SIGN_STYLE = Automatic;
-				CURRENT_PROJECT_VERSION = 34;
+				CURRENT_PROJECT_VERSION = 36;
 				DEFINES_MODULE = NO;
 				DEVELOPMENT_TEAM = 72P5Y6N578;
 				INFOPLIST_FILE = App/Info.plist;

+ 13 - 1
src/main.js

@@ -125,7 +125,13 @@ const initAF = () => {
         })
     AppsFlyer.addListener(AFConstants.CONVERSION_CALLBACK, event => {
         if (event.callbackName === AFConstants.onConversionDataSuccess) {
-            console.log('ConversionData: ', event.data)
+            console.log('ConversionData: ', event)
+            setTimeout(() => {
+                console.log('ConversionData: ', event)
+            }, 30000)
+            setTimeout(() => {
+                console.log('ConversionData: ', event)
+            }, 60000)
             if (event.data.invitor) {
                 localStorage.setItem('invitor', event.data.invitor)
             }
@@ -139,6 +145,9 @@ const initAF = () => {
     AppsFlyer.addListener(AFConstants.UDL_CALLBACK, event => {
         if (event.status === 'FOUND') {
             console.log('udl found: ', event.deepLink)
+            if (event.invitor) {
+                localStorage.setItem('invitor', event.invitor)
+            }
         } else if (event.status === 'ERROR') {
             console.log('udl error: ', event.error)
         }
@@ -201,3 +210,6 @@ document.addEventListener('deviceready', () => {
 if (useStorage('showConsole', 0).value > new Date().getTime()) {
     initEruda()
 }
+if (location.origin.includes('http://192.168')) {
+    initEruda()
+}

+ 3 - 3
src/version.json

@@ -1,12 +1,12 @@
 {
     "ios": {
         "version": "1.0.0",
-        "build": 34
+        "build": 36
     },
     "android": {
         "version": "1.0.0",
-        "build": 34,
+        "build": 36,
         "versionCode": 12
     },
-    "www": 1017
+    "www": 1019
 }

+ 36 - 30
src/views/DistributionPage.vue

@@ -19,7 +19,7 @@
                         <ion-icon :icon="caretForwardCircleOutline"></ion-icon>
                     </div>
                 </div> -->
-                <!-- <div class="btn-invite" @click="drawQr"></div> -->
+                <!-- <div class="btn-invite" @click="onOpenInviteModal"></div> -->
             </div>
             <div class="stat">
                 <div class="bg">
@@ -47,7 +47,7 @@
                     </div>
                 </div>
             </div>
-            <div class="invite" @click="drawQr">
+            <div class="invite" @click="onOpenInviteModal">
                 <img src="@/assets/invite-bg.png" alt="" class="invite-bg" />
                 <span class="animate__pulse animate__animated animate__infinite">{{ $t('distribution.invite') }}</span>
             </div>
@@ -93,6 +93,7 @@ import { Filesystem, Directory, Encoding } from '@capacitor/filesystem'
 import { Media } from '@capacitor-community/media'
 import emptyImg from '@/assets/img_empty.png'
 import '@/styles/animate.css'
+import { AppsFlyer } from 'appsflyer-capacitor-plugin'
 
 export default {
     components: {
@@ -144,7 +145,7 @@ export default {
         this.showToolbar = this.$route.meta.showToolbar === true
         setTimeout(() => {
             if (this.$route.query.showShare === 'true' || this.$route.query.showShare == true) {
-                this.drawQr()
+                this.onOpenInviteModal()
             }
             this.$router.replace({ query: {} })
         }, 500)
@@ -161,25 +162,31 @@ export default {
                 this.empty = res.empty
             })
         },
-        drawQr() {
+        async getInviteUrl() {
+            if (Capacitor.isNativePlatform()) {
+                const { link } = await AppsFlyer.generateInviteLink({
+                    addParameters: { invitor: `${this.user.id}`, af_sub1: `${this.user.id}` }
+                })
+                return link
+            } else {
+                return `https://ifirstcash.onelink.me/cQAJ?af_js_web=true&af_ss_ver=2_3_0&pid=af_user_invite&invitor=${this.user.id}&af_sub1=${this.user.id}&af_ss_ui=true`
+            }
+        },
+        async onOpenInviteModal() {
             let qrImg = new Image()
             let bgImg = new Image()
-            let userId = this.user.id
-            function loadQR(text) {
+            const url = await this.getInviteUrl()
+            function loadQR() {
                 return new Promise((resolve, reject) => {
-                    qrcode.toDataURL(
-                        `https://ifirstcash.onelink.me/cQAJ/d0785cqz?invitor=${userId}`,
-                        { width: 335, height: 335, margin: 0 },
-                        function (err, url) {
-                            if (err) {
-                                reject(err)
-                            }
-                            qrImg.onload = () => {
-                                resolve()
-                            }
-                            qrImg.src = url
+                    qrcode.toDataURL(url, { width: 335, height: 335, margin: 0 }, function (err, url) {
+                        if (err) {
+                            reject(err)
+                        }
+                        qrImg.onload = () => {
+                            resolve()
                         }
-                    )
+                        qrImg.src = url
+                    })
                 })
             }
             function loadBg() {
@@ -191,18 +198,17 @@ export default {
                 })
             }
             this.$toast.loading('loading...')
-            Promise.all([loadQR(), loadBg()]).then(() => {
-                this.$toast.dismiss()
-                let canvas = document.createElement('canvas')
-                canvas.width = 1125
-                canvas.height = 1740
-                let ctx = canvas.getContext('2d')
-                ctx.drawImage(bgImg, 0, 0)
-                ctx.drawImage(qrImg, 395, 1095, 335, 335)
-                let dataUrl = canvas.toDataURL('image/png')
-                this.posterUrl = dataUrl
-                this.showShareModal = true
-            })
+            await Promise.all([loadQR(), loadBg()])
+            this.$toast.dismiss()
+            let canvas = document.createElement('canvas')
+            canvas.width = 1125
+            canvas.height = 1740
+            let ctx = canvas.getContext('2d')
+            ctx.drawImage(bgImg, 0, 0)
+            ctx.drawImage(qrImg, 395, 1095, 335, 335)
+            let dataUrl = canvas.toDataURL('image/png')
+            this.posterUrl = dataUrl
+            this.showShareModal = true
         },
         async save() {
             if (Capacitor.isNativePlatform()) {

+ 1 - 0
vite.config.js

@@ -11,6 +11,7 @@ export default defineConfig(({ command, mode }) => {
         base: process.env.VITE_BASE_URL,
         server: {
             host: '0.0.0.0',
+            port: 3000,
             fs: {
                 strict: false
             }