liming 3 tuần trước cách đây
mục cha
commit
6b8e62f521

+ 0 - 1
android/app/capacitor.build.gradle

@@ -17,7 +17,6 @@ dependencies {
     implementation project(':capacitor-push-notifications')
     implementation project(':capacitor-status-bar')
     implementation project(':capacitor-toast')
-    implementation project(':capawesome-capacitor-app-update')
 
 }
 apply from: "../../node_modules/.store/cordova-plugin-fingerprint-aio@6.0.1/node_modules/cordova-plugin-fingerprint-aio/src/android/build.gradle"

+ 4 - 9
capacitor.config.ts

@@ -1,9 +1,7 @@
 import { CapacitorConfig } from '@capacitor/cli';
-import * as fs from 'fs';
-
-// 读取 package.json 的 version
-const packageJson = JSON.parse(fs.readFileSync('./package.json', 'utf8'));
-const appVersion = packageJson.version;
+import { updateVersion } from './scripts/sync-version';
+ 
+updateVersion() 
 
 const config: CapacitorConfig = {
   appId: 'com.example.app',
@@ -40,10 +38,7 @@ const config: CapacitorConfig = {
     // 注意:原JSON中嵌套了重复的"plugins"键,已修正
     PushNotifications: {
       presentationOptions: ['badge', 'sound', 'alert']
-    },
-    VersionSync: {
-      version: appVersion, // 直接传递版本号
-    },
+    }
   },
 
   // 资源文件配置

+ 34 - 0
scripts/sync-version.js

@@ -0,0 +1,34 @@
+import fs from "fs";
+import path from "path";
+
+export const updateVersion = () => {
+  // 读取 package.json 版本
+  const packageJson = JSON.parse(fs.readFileSync("./package.json", "utf8"));
+  const version = packageJson.version;
+ 
+  const rootDir = process.cwd();
+
+  // 更新 Android 版本
+  const androidBuildGradlePath = path.join(
+    rootDir,
+    "android/app/build.gradle"
+  );
+  let androidBuildGradle = fs.readFileSync(androidBuildGradlePath, "utf8");
+  androidBuildGradle = androidBuildGradle.replace(
+    /versionName\s+".*?"/,
+    `versionName "${version}"`
+  );
+  fs.writeFileSync(androidBuildGradlePath, androidBuildGradle);
+
+  // 更新 iOS 版本
+  const iosPlistPath = path.join(rootDir, "ios/App/App/Info.plist");
+  let iosPlist = fs.readFileSync(iosPlistPath, "utf8");
+  iosPlist = iosPlist.replace(
+    /<key>CFBundleShortVersionString<\/key>\s*<string>.*?<\/string>/,
+    `<key>CFBundleShortVersionString</key>\n\t<string>${version}</string>`
+  );
+  fs.writeFileSync(iosPlistPath, iosPlist);
+
+  console.log(`✅ 版本号已同步至: ${version}`);
+  return version
+};

+ 3 - 11
src/App.vue

@@ -7,7 +7,7 @@
     class="app-bar-header"
     :style="notchStyle"
   />
-  <RouterView :style="mainStyle" />
+  <RouterView />
 </template>
 
 <script setup>
@@ -17,8 +17,7 @@ const route = useRoute();
 const router = useRouter();
 
 const notchStyle = ref({});
-const mainStyle = ref({});
-
+ 
 const goBack = () => {
   if (route.meta.navbar) {
     router.back();
@@ -30,14 +29,7 @@ onBeforeMount(async () => {
   notchStyle.value = { 
     paddingTop: `${height}px`,
   };
-
-  if (route.meta.navbar) {
-    mainStyle.value.marginTop = `0 px`;
-  } else {
-    mainStyle.value = {
-      marginTop: `${height}px`,
-    };
-  }
+ 
 
   appStart()
 });

+ 25 - 48
src/hooks/updataApp.js

@@ -1,60 +1,37 @@
-import { Capacitor } from '@capacitor/core';
-import { AppUpdate } from '@capawesome/capacitor-app-update';
-
-
-
-
-// 获取当前应用版本
-const getCurrentAppVersion = async () => {
-  const result = await AppUpdate.getAppUpdateInfo();
-
-  console.log('当前应用版本:', result);
-  // if (Capacitor.getPlatform() === 'android') {
-  //   return result.currentVersionCode;
-  // } else {
-  //   return result.currentVersionName;
-  // }
-};
-
-
-
-
-
-
-
-
-
-
-
+import { App } from "@capacitor/app";
+import { Capacitor } from "@capacitor/core";
 
+ 
 
 // 检测是否有更新包
-export const checkUpdate = async () => { 
+export const checkUpdate = async () => {
+  // 判断是否是web端
+  if (Capacitor.getPlatform() === "web") {
+    return;
+  }
   // 获取当前应用版本
-  const info = await App.getInfo(); 
-  console.log("当前版本:", info)
- 
-  // // 从服务器获取最新版本信息
-  // const response = await fetch('https://your-server.com/api/check-update');
-  // const serverData = await response.json();
-
-  //  // 对比版本号(建议使用语义化版本比较库,如 compare-versions)
-  // if (compareVersions(serverData.latestVersion, version) > 0) {
-  //   console.log('发现新版本:', serverData.latestVersion);
-  //   return serverData; // 返回更新信息
-  // }
+  const { version } = await App.getInfo();
+  console.log("当前版本:", info);
+
+  // 从服务器获取最新版本信息
+  const response = await fetch('https://your-server.com/api/check-update');
+  const serverData = await response.json();
+
+   // 对比版本号(建议使用语义化版本比较库,如 compare-versions)
+  if (compareVersions(serverData.latestVersion, version) > 0) {
+    console.log('发现新版本:', serverData.latestVersion);
+    return serverData; // 返回更新信息
+  }
   return null; // 无更新
-}
-
+};
 
 // 示例:在应用启动时检查
 export const appStart = async () => {
   // const updateInfo = await checkUpdate();
   // if (updateInfo) {
-    // showUpdateDialog(updateInfo); // 提示用户更新
+  // showUpdateDialog(updateInfo); // 提示用户更新
   // }
 
-
-  const dd = await getCurrentAppVersion()
-  console.log("当前版本:", dd)
-}
+  const dd = await checkUpdate();
+  console.log("当前版本:", dd);
+};

+ 2 - 1
src/views/wallet/index.vue

@@ -265,6 +265,7 @@
       height: 286px;
       width: 100%;
       position: absolute;
+      top: -4px;
       left: 0;
       z-index: -1;
     }
@@ -321,7 +322,7 @@
       backdrop-filter: blur(3px);  
       -webkit-backdrop-filter: blur(3px);  
       border-radius: 15px;
-      margin: 0 17px 23px;
+      margin: 0 17px 20px 17px;
       box-shadow:0 7px 10px #15277031;
       box-sizing: border-box;
       display: flex;