x1ongzhu před 1 rokem
rodič
revize
425378567d

+ 16 - 4
android/app/build.gradle

@@ -19,8 +19,8 @@ android {
         versionName "1.0.0-7"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         aaptOptions {
-             // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
-             // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
+            // Files and dirs to omit from the packaged assets dir, modified to accommodate modern web apps.
+            // Default: https://android.googlesource.com/platform/frameworks/base/+/282e181b58cf72b6ca770dc7ca5f91f135444502/tools/aapt/AaptAssets.cpp#61
             ignoreAssetsPattern '!.svn:!.git:!.ds_store:!*.scc:.*:!CVS:!thumbs.db:!picasa.ini:!*~'
         }
     }
@@ -30,10 +30,22 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    flavorDimensions "version"
+    productFlavors {
+        prod {
+            dimension "version"
+        }
+        id {
+            dimension "version"
+            applicationIdSuffix ".id"
+        }
+
+    }
 }
 
 repositories {
-    flatDir{
+    flatDir {
         dirs '../capacitor-cordova-android-plugins/src/main/libs', 'libs'
     }
 }
@@ -57,6 +69,6 @@ try {
     if (servicesJSON.text) {
         apply plugin: 'com.google.gms.google-services'
     }
-} catch(Exception e) {
+} catch (Exception e) {
     logger.info("google-services.json not found, google-services plugin not applied. Push Notifications won't work")
 }

+ 2 - 2
android/app/src/main/res/values/strings.xml

@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding='utf-8'?>
 <resources>
-    <string name="app_name">走馬短劇</string>
-    <string name="title_activity_main">走馬短劇</string>
+    <string name="app_name">Kilat Drama</string>
+    <string name="title_activity_main">Kilat Drama</string>
     <string name="package_name">com.hasiwlas.shorts</string>
     <string name="custom_url_scheme">com.hasiwlas.shorts</string>
 </resources>

+ 1 - 1
capacitor.config.ts

@@ -4,7 +4,7 @@ import { ip, ipv6, mac } from 'address'
 let config: CapacitorConfig
 const baseConfig: CapacitorConfig = {
     appId: 'com.hasiwlas.shorts',
-    appName: '走馬短劇',
+    appName: 'Kilat Drama',
     webDir: 'dist',
     bundledWebRuntime: true,
     backgroundColor: '#1C1C1C',

+ 5 - 1
src/components/PurchaseModal.vue

@@ -74,14 +74,18 @@ const selected = ref(0)
 function buy() {
     const { store, ProductType, Platform } = CdvPurchase
     store.when().finished(() => {
+        emit('update:show', false)
         getBalance()
     })
-    store.validator = uri.resolve(import.meta.env.VITE_HTTP_BASE_URL, '/api/userBalances/recharge/' + user.id)
+    store.validator = uri.resolve(import.meta.env.VITE_HTTP_BASE_URL, '/api/userBalances/recharge/' + user.value.id)
     // store.validator = 'http://192.168.6.215:3333/api/userBalances/recharge/1'
     console.log(products.value[selected.value].id)
     const product = store.get(products.value[selected.value].id, Platform.GOOGLE_PLAY)
     const myTransaction = store.findInLocalReceipts(product)
     console.log('myTransaction', myTransaction)
+    if (myTransaction) {
+        myTransaction.verify()
+    }
     console.log('product', product)
     product.getOffer().order()
 }

+ 4 - 1
src/locales/index.js

@@ -6,7 +6,10 @@ const messages = {
     idID: idID
 }
 const i18n = createI18n({
-    locale: navigator.language === 'id' ? 'idID' : 'zhTW',
+    locale:
+        navigator.language === 'id' || navigator.language === 'id-ID' || navigator.language === 'id_ID'
+            ? 'idID'
+            : 'zhTW',
     fallbackLocale: 'zhTW',
     messages,
     legacy: false

+ 1 - 1
src/plugins/updater_meta.json

@@ -1 +1 @@
-{"version":44}
+{"version":48}