From fe8569e82dd94144038134b652fc90cbe76685db Mon Sep 17 00:00:00 2001 From: GeJiaXiang <353358601@qq.com> Date: Mon, 8 Apr 2024 13:30:35 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=A3=E5=91=B3=EF=BC=9Axie=E6=94=B9?= =?UTF-8?q?=E4=B8=BAlocal?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- star_lock/android/app/build.gradle | 14 +++++++------- .../res/mipmap-hdpi/ic_launcher.png | Bin .../res/mipmap-mdpi/ic_launcher.png | Bin .../res/mipmap-xhdpi/ic_launcher.png | Bin .../res/mipmap-xxhdpi/ic_launcher.png | Bin .../res/mipmap-xxxhdpi/ic_launcher.png | Bin star_lock/flavorizr.yaml | 8 ++++---- star_lock/lib/flavors.dart | 18 ++++++++---------- .../lib/{main_xie.dart => main_local.dart} | 2 +- 9 files changed, 20 insertions(+), 22 deletions(-) rename star_lock/android/app/src/{xie => local}/res/mipmap-hdpi/ic_launcher.png (100%) rename star_lock/android/app/src/{xie => local}/res/mipmap-mdpi/ic_launcher.png (100%) rename star_lock/android/app/src/{xie => local}/res/mipmap-xhdpi/ic_launcher.png (100%) rename star_lock/android/app/src/{xie => local}/res/mipmap-xxhdpi/ic_launcher.png (100%) rename star_lock/android/app/src/{xie => local}/res/mipmap-xxxhdpi/ic_launcher.png (100%) rename star_lock/lib/{main_xie.dart => main_local.dart} (78%) diff --git a/star_lock/android/app/build.gradle b/star_lock/android/app/build.gradle index 89e4ce38..11d3360c 100644 --- a/star_lock/android/app/build.gradle +++ b/star_lock/android/app/build.gradle @@ -36,8 +36,8 @@ android { keyAlias = 'starlock' keyPassword '123456' } - // 下面的xie、pre、sky、xhj 都是自定义变量，自身不起任何作用，而是看哪里引用了它们 - xie { + // 下面的local、pre、sky、xhj 都是自定义变量，自身不起任何作用，而是看哪里引用了它们 + local { storeFile file("starlock.keystore") storePassword '123456' keyAlias = 'starlock' @@ -68,12 +68,12 @@ android { flavorDimensions "flavor-type" productFlavors { - xie { + local { dimension "flavor-type" - applicationId "com.starlock.lock.xie" + applicationId "com.starlock.lock.local" signingConfig signingConfigs.pre - resValue "string", "app_name", "星锁-xie" - manifestPlaceholders.JPUSH_PKGNAME = "com.starlock.lock.xie" + resValue "string", "app_name", "星锁-local" + manifestPlaceholders.JPUSH_PKGNAME = "com.starlock.lock.local" } dev { dimension "flavor-type" @@ -182,7 +182,7 @@ android { // 真实的解决办法 minifyEnabled false shrinkResources false - productFlavors.xie.signingConfig signingConfigs.pre + productFlavors.local.signingConfig signingConfigs.pre productFlavors.dev.signingConfig signingConfigs.pre productFlavors.pre.signingConfig signingConfigs.pre productFlavors.sky.signingConfig signingConfigs.sky diff --git a/star_lock/android/app/src/xie/res/mipmap-hdpi/ic_launcher.png b/star_lock/android/app/src/local/res/mipmap-hdpi/ic_launcher.png similarity index 100% rename from star_lock/android/app/src/xie/res/mipmap-hdpi/ic_launcher.png rename to star_lock/android/app/src/local/res/mipmap-hdpi/ic_launcher.png diff --git a/star_lock/android/app/src/xie/res/mipmap-mdpi/ic_launcher.png b/star_lock/android/app/src/local/res/mipmap-mdpi/ic_launcher.png similarity index 100% rename from star_lock/android/app/src/xie/res/mipmap-mdpi/ic_launcher.png rename to star_lock/android/app/src/local/res/mipmap-mdpi/ic_launcher.png diff --git a/star_lock/android/app/src/xie/res/mipmap-xhdpi/ic_launcher.png b/star_lock/android/app/src/local/res/mipmap-xhdpi/ic_launcher.png similarity index 100% rename from star_lock/android/app/src/xie/res/mipmap-xhdpi/ic_launcher.png rename to star_lock/android/app/src/local/res/mipmap-xhdpi/ic_launcher.png diff --git a/star_lock/android/app/src/xie/res/mipmap-xxhdpi/ic_launcher.png b/star_lock/android/app/src/local/res/mipmap-xxhdpi/ic_launcher.png similarity index 100% rename from star_lock/android/app/src/xie/res/mipmap-xxhdpi/ic_launcher.png rename to star_lock/android/app/src/local/res/mipmap-xxhdpi/ic_launcher.png diff --git a/star_lock/android/app/src/xie/res/mipmap-xxxhdpi/ic_launcher.png b/star_lock/android/app/src/local/res/mipmap-xxxhdpi/ic_launcher.png similarity index 100% rename from star_lock/android/app/src/xie/res/mipmap-xxxhdpi/ic_launcher.png rename to star_lock/android/app/src/local/res/mipmap-xxxhdpi/ic_launcher.png diff --git a/star_lock/flavorizr.yaml b/star_lock/flavorizr.yaml index 888c136f..f45858db 100644 --- a/star_lock/flavorizr.yaml +++ b/star_lock/flavorizr.yaml @@ -53,16 +53,16 @@ app: flavorDimensions: "flavor-type" flavors: - xie: + local: app: - name: "星锁-xie" + name: "星锁-local" icon: "assets/icon/dev.png" android: - applicationId: "com.starlock.lock.xie" + applicationId: "com.starlock.lock.local" customConfig: signingConfig: signingConfigs.pre ios: - bundleId: "com.starlock.lock.xie" + bundleId: "com.starlock.lock.local" dev: app: name: "星锁-dev" diff --git a/star_lock/lib/flavors.dart b/star_lock/lib/flavors.dart index fc681b1a..7c48b74c 100644 --- a/star_lock/lib/flavors.dart +++ b/star_lock/lib/flavors.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; enum Flavor { - xie, + local, dev, pre, sky, @@ -25,8 +25,8 @@ class F { static String get title { switch (appFlavor) { - case Flavor.xie: - return '星锁-xie'; + case Flavor.local: + return '星锁-local'; case Flavor.dev: return '星锁-dev'; case Flavor.pre: @@ -42,8 +42,8 @@ class F { static String get navTitle { switch (appFlavor) { - case Flavor.xie: - return '${"starLock".tr}-xie'; + case Flavor.local: + return '${"starLock".tr}-local'; case Flavor.dev: return '${"starLock".tr}-dev'; case Flavor.pre: @@ -59,10 +59,8 @@ class F { static String get apiPrefix { switch (appFlavor) { - // case Flavor.ge: - // return 'https://ge.lock.star-lock.cn'; - case Flavor.xie: - return 'http://192.168.1.15:8022'; + case Flavor.local: + return 'https://ge.lock.star-lock.cn'; case Flavor.dev: return 'https://dev.lock.star-lock.cn'; case Flavor.pre: @@ -80,7 +78,7 @@ class F { // StarLockAMapKey static StarLockAMapKey get aMapKey { switch (appFlavor) { - case Flavor.xie: + case Flavor.local: case Flavor.dev: return const StarLockAMapKey( androidKey: 'b56b681ee89f4db43a5aa1879ae8cbfe', diff --git a/star_lock/lib/main_xie.dart b/star_lock/lib/main_local.dart similarity index 78% rename from star_lock/lib/main_xie.dart rename to star_lock/lib/main_local.dart index cd62b84c..a6fd745a 100644 --- a/star_lock/lib/main_xie.dart +++ b/star_lock/lib/main_local.dart @@ -3,6 +3,6 @@ import 'flavors.dart'; import 'main.dart' as runner; Future main() async { - F.appFlavor = Flavor.xie; + F.appFlavor = Flavor.local; await runner.main(); }