diff --git a/app/build.gradle b/app/build.gradle index 56e156c655..381e66c355 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -160,7 +160,7 @@ android { } productFlavors { - // internal test dev host + // internal, 内部测试包使用的 flavor,接口包含包括测试和正式环境 internal { dimension "env" versionNameSuffix "-debug" @@ -172,7 +172,7 @@ android { buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${DEV_QUICK_LOGIN_APPKEY}\"" } - // publish release host + // publish, 发布时候使用的 flavor,接口仅包含正式环境 publish { dimension "env" diff --git a/gradle.properties b/gradle.properties index d750cd965a..02dd89cc0e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -60,6 +60,9 @@ NEW_API_HOST=https\://app-api.ghzs.com/ DEV_VAPI_HOST=https://dev-app-api.796697.com VAPI_HOST=https://app-api.796697.com +DEV_SA_SERVER_URL=https://sensors-data-api.ghzs.com/sa?project=default +SA_SERVER_URL=https://sensors-data-api.ghzs.com/sa?project=production + android.useAndroidX=true android.enableJetifier=true diff --git a/module_sensors_data/build.gradle b/module_sensors_data/build.gradle index d411020fea..ca523de026 100644 --- a/module_sensors_data/build.gradle +++ b/module_sensors_data/build.gradle @@ -23,22 +23,27 @@ android { } } - buildTypes { - debug { + flavorDimensions("env") + + productFlavors { + // internal, 内部测试包使用的 flavor,接口包含包括测试和正式环境 + internal { + dimension "env" + manifestPlaceholders.put("SENSORS_SCHEME", "sad821cc0b") - buildConfigField "String", "SA_SERVER_URL", "\"https://sensors-data-api.ghzs.com/sa?project=default\"" + + buildConfigField "String", "DEV_SA_SERVER_URL", "\"${DEV_SA_SERVER_URL}\"" + buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" } - release { - var isTestBuild = true + // publish, 发布时候使用的 flavor,接口仅包含正式环境 + publish { + dimension "env" - if (!isTestBuild) { - manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") - buildConfigField "String", "SA_SERVER_URL", "\"https://sensors-data-api.ghzs.com/sa?project=production\"" - } else { - manifestPlaceholders.put("SENSORS_SCHEME" , "sad821cc0b") - buildConfigField "String", "SA_SERVER_URL", "\"https://sensors-data-api.ghzs.com/sa?project=default\"" - } + manifestPlaceholders.put("SENSORS_SCHEME" , "saf547873a") + + buildConfigField "String", "DEV_SA_SERVER_URL", "\"${SA_SERVER_URL}\"" + buildConfigField "String", "SA_SERVER_URL", "\"${SA_SERVER_URL}\"" } } diff --git a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt index 00c9155c37..27c83fb92c 100644 --- a/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt +++ b/module_sensors_data/src/main/java/com/gh/gamecenter/sensorsdata/SensorsHelper.kt @@ -26,9 +26,11 @@ object SensorsHelper { fun init(context: Context, channel: String) { // 初始化 Utils.log(TAG, "init $channel") + val serverUrl = if (EnvHelper.isDevEnv) BuildConfig.DEV_SA_SERVER_URL else BuildConfig.SA_SERVER_URL + SensorsDataAPI.startWithConfigOptions( context, - SAConfigOptions(BuildConfig.SA_SERVER_URL).apply { + SAConfigOptions(serverUrl).apply { enableLog(EnvHelper.isDevEnv) }) diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index 5a9e392d49..f19de9e4e9 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -15,10 +15,8 @@ git checkout module_common/build.gradle # 开启 mapping 上传 if [[ "$OSTYPE" == "darwin"* ]]; then sed -i '' '1 a plugins { id "io.sentry.android.gradle" version "2.1.5" } ' app/build.gradle - sed -i '' 's/var isTestBuild = true/var isTestBuild = false/g' module_sensors_data/build.gradle else sed -i '1 a plugins { id "io.sentry.android.gradle" version "2.1.5" }' app/build.gradle - sed -i 's/var isTestBuild = true/var isTestBuild = false/g' module_sensors_data/build.gradle fi sed -i 's/buildConfigField "boolean", "IS_VGAME_ON", "true"/buildConfigField "boolean", "IS_VGAME_ON", "true"/g' module_common/build.gradle