From 026166a0106857b804f6ec216109953d6bc1aa54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E5=B2=A9?= Date: Tue, 8 Jul 2025 19:23:51 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=8A=E4=BC=A0npm=E6=89=93=E5=8C=85?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Android/build.gradle | 2 +- Android/local.properties | 11 +---------- Android/simpleDemo/build.gradle | 1 + build-config/android/development.config | 3 +++ package.json | 2 ++ 5 files changed, 8 insertions(+), 11 deletions(-) create mode 100644 build-config/android/development.config diff --git a/Android/build.gradle b/Android/build.gradle index 3e563129..977e454c 100644 --- a/Android/build.gradle +++ b/Android/build.gradle @@ -1,4 +1,4 @@ -// Top-level build file where you can add configuration options common to all sub-projects/modules. +f // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { repositories { diff --git a/Android/local.properties b/Android/local.properties index cb2da315..b72653d2 100644 --- a/Android/local.properties +++ b/Android/local.properties @@ -1,10 +1 @@ -## This file must *NOT* be checked into Version Control Systems, -# as it contains information specific to your local configuration. -# -# Location of the SDK. This is only used by Gradle. -# For customization when using a Version Control System, please read the -# header note. -#Thu Jul 03 09:46:08 CST 2025 - -#sdk.dir=C\:\\Users\\ty\\AppData\\Local\\Android\\Sdk -sdk.dir=/data/jenkins/agent/workspace/tra-app-build-test/android-sdk +sdk.dir=/data/jenkins/agent/workspace/tra-app-build-test/android-sdk \ No newline at end of file diff --git a/Android/simpleDemo/build.gradle b/Android/simpleDemo/build.gradle index 6454fbc1..ab561bce 100644 --- a/Android/simpleDemo/build.gradle +++ b/Android/simpleDemo/build.gradle @@ -63,3 +63,4 @@ dependencies { implementation 'androidx.webkit:webkit:1.5.0' } +def sdkDir = System.getenv("versionName") ?: "C\:\\Users\\ty\\AppData\\Local\\Android\\Sdk" \ No newline at end of file diff --git a/build-config/android/development.config b/build-config/android/development.config new file mode 100644 index 00000000..50ea0783 --- /dev/null +++ b/build-config/android/development.config @@ -0,0 +1,3 @@ + +SDK_DIR="/data/jenkins/agent/workspace/tra-app-build-test/android-sdk" +APK_ENV_PREFIX="dev" \ No newline at end of file diff --git a/package.json b/package.json index 8cd7fd6c..a0a30762 100644 --- a/package.json +++ b/package.json @@ -6,6 +6,8 @@ "dev:h5": "uni", "dev:h5:sit": "uni -p h5 --mode sit", "dev:h5:uat": "uni -p h5 --mode uat", + "dev:h5:production": "uni -p h5 --mode production", + "build:app-plus:dev": "uni build -p app-plus --mode development", "build:app-plus:sit": "uni build -p app-plus --mode sit", "build:app-plus:uat": "uni build -p app-plus --mode uat", "build:app-plus": "uni build -p app-plus",