From 0afefdffb69289a2f4474e50cdc8715908ebf01b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= Date: Wed, 1 Jun 2022 11:56:42 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B0=86BUILD=5FTIME=E3=80=81IS=5FNIGHT=5FMODE?= =?UTF-8?q?=5FON=E7=A7=BB=E5=8A=A8=E5=88=B0module=5Fcommon/build.gradle?= =?UTF-8?q?=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 7 ------- .../java/com/gh/common/provider/BuildConfigImpl.kt | 3 --- app/src/main/java/com/gh/common/util/DataUtils.java | 2 +- .../com/gh/flutter/FlutterContextServiceImplAop.java | 2 +- .../java/com/gh/gamecenter/SuggestionActivity.java | 4 ++-- .../gh/gamecenter/help/QaFeedbackDialogFragment.kt | 2 +- .../com/gh/gamecenter/security/BindPhoneFragment.kt | 2 +- .../com/halo/assistant/fragment/SettingsFragment.kt | 3 ++- module_common/build.gradle | 6 ++++++ .../common/base/activity/BaseActivity.java | 10 +++------- .../common/base/fragment/BaseFragment.java | 12 +++--------- .../com/gh/gamecenter/common/utils/Extensions.kt | 9 +++------ .../com/gh/gamecenter/common/utils/NightModeUtils.kt | 7 +++---- .../gamecenter/common/utils/PackageFlavorHelper.java | 8 ++------ .../gamecenter/core/provider/IBuildConfigProvider.kt | 9 +++++++-- scripts/build_with_chucker_open.sh | 10 +++++----- scripts/build_with_simple_backup.sh | 8 ++++++-- scripts/dokit_build.sh | 6 ++++-- scripts/jenkins_build.sh | 8 ++++---- scripts/jenkins_flutter_build.sh | 8 ++++---- scripts/test_build.sh | 8 ++++---- 21 files changed, 62 insertions(+), 72 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 5590d9c0e1..4bfac01cfc 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -80,13 +80,6 @@ android { buildConfigField "String", "WEIBO_APPKEY", "\"${WEIBO_APPKEY}\"" buildConfigField "String", "QUICK_LOGIN_APPID", "\"${QUICK_LOGIN_APPID}\"" buildConfigField "String", "QUICK_LOGIN_APPKEY", "\"${QUICK_LOGIN_APPKEY}\"" - - /** - * Build Time 供区分 jenkins 打包时间用 - * IS_NIGHT_MODE_ON 供区分夜间模式功能是否启用 - */ - buildConfigField "long", "BUILD_TIME", "0" - buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true" } // gradle 2.2以上默认同时启用v1和v2（优先用于Android N） diff --git a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt index ba6ea87825..9ce6c309f8 100644 --- a/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt +++ b/app/src/main/java/com/gh/common/provider/BuildConfigImpl.kt @@ -20,8 +20,6 @@ class BuildConfigImpl : IBuildConfigProvider { override fun isDebug(): Boolean = BuildConfig.DEBUG - override fun getBuildTime(): Long = BuildConfig.BUILD_TIME - override fun getApiHost(): String = BuildConfig.API_HOST override fun getDevApiHost(): String = BuildConfig.DEV_API_HOST @@ -30,5 +28,4 @@ class BuildConfigImpl : IBuildConfigProvider { override fun getNewDevApiHost(): String = BuildConfig.NEW_DEV_API_HOST - override fun getIsNightModeOn(): Boolean = BuildConfig.IS_NIGHT_MODE_ON } \ No newline at end of file diff --git a/app/src/main/java/com/gh/common/util/DataUtils.java b/app/src/main/java/com/gh/common/util/DataUtils.java index 009219f997..b4bcc66cb4 100644 --- a/app/src/main/java/com/gh/common/util/DataUtils.java +++ b/app/src/main/java/com/gh/common/util/DataUtils.java @@ -85,7 +85,7 @@ public class DataUtils { }); Sentry.configureScope(scope -> { - if (BuildConfig.BUILD_TIME != 0L) { + if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0L) { scope.setTag("alias", "内测版" + BuildConfig.VERSION_NAME); } else { scope.setTag("alias", "正式版" + BuildConfig.VERSION_NAME); diff --git a/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java b/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java index 5093e2ca67..727a8bf25b 100644 --- a/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java +++ b/app/src/main/java/com/gh/flutter/FlutterContextServiceImplAop.java @@ -3,10 +3,10 @@ package com.gh.flutter; import android.text.TextUtils; import com.gh.common.constant.Config; +import com.gh.gamecenter.common.BuildConfig; import com.gh.gamecenter.common.exposure.meta.MetaUtil; import com.gh.gamecenter.common.utils.EnvHelper; import com.gh.gamecenter.common.utils.TimestampUtils; -import com.gh.gamecenter.BuildConfig; import com.gh.gamecenter.entity.SettingsEntity; import com.halo.assistant.HaloApp; diff --git a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java index a744421e07..5a2c290223 100644 --- a/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java +++ b/app/src/main/java/com/gh/gamecenter/SuggestionActivity.java @@ -1266,8 +1266,8 @@ public class SuggestionActivity extends ToolBarActivity implements OnRequestCall message = content; if (mSuggestType == SuggestType.crash) { params.put("log", readFromFile()); - if (BuildConfig.BUILD_TIME != 0) { - message = message + " [此闪退基于" + BuildConfig.BUILD_TIME + "测试包]"; + if (com.gh.gamecenter.common.BuildConfig.BUILD_TIME != 0) { + message = message + " [此闪退基于" + com.gh.gamecenter.common.BuildConfig.BUILD_TIME + "测试包]"; } } } diff --git a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt index 9dbb9f10bc..6177ebd727 100644 --- a/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/help/QaFeedbackDialogFragment.kt @@ -12,9 +12,9 @@ import androidx.lifecycle.Lifecycle import androidx.recyclerview.widget.GridLayoutManager import com.gh.common.util.* import com.gh.gamecenter.common.view.GridSpacingItemDecoration -import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R import com.gh.gamecenter.SuggestionActivity +import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.utils.NightModeUtils.getSystemMode import com.gh.gamecenter.common.utils.NightModeUtils.isNightMode import com.gh.gamecenter.common.utils.dip2px diff --git a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt index 3740ed8516..4a5cacf96c 100644 --- a/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt +++ b/app/src/main/java/com/gh/gamecenter/security/BindPhoneFragment.kt @@ -10,8 +10,8 @@ import com.gh.gamecenter.common.constant.Constants import com.gh.common.util.* import com.gh.common.util.DialogUtils import com.gh.common.util.EnergyTaskHelper.postInviteCodeTask -import com.gh.gamecenter.BuildConfig import com.gh.gamecenter.R +import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.EntranceConsts import com.gh.gamecenter.common.utils.* diff --git a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt index d910bcd0bd..487e10269d 100644 --- a/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt +++ b/app/src/main/java/com/halo/assistant/fragment/SettingsFragment.kt @@ -20,6 +20,7 @@ import com.gh.common.util.DialogUtils import com.gh.common.util.NewLogUtils import com.gh.download.server.BrowserInstallHelper import com.gh.gamecenter.* +import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.base.fragment.ToolbarFragment import com.gh.gamecenter.common.callback.ConfirmListener import com.gh.gamecenter.common.constant.Constants @@ -276,7 +277,7 @@ class SettingsFragment : ToolbarFragment() { //这种方案适用于 API 26, 即8.0（含8.0）以上可以用 val notifyIntent = Intent() notifyIntent.action = Settings.ACTION_APP_NOTIFICATION_SETTINGS - notifyIntent.putExtra(Settings.EXTRA_APP_PACKAGE, BuildConfig.APPLICATION_ID) + notifyIntent.putExtra(Settings.EXTRA_APP_PACKAGE, com.gh.gamecenter.BuildConfig.APPLICATION_ID) startActivity(notifyIntent) } else { PermissionHelper.toPermissionSetting(requireActivity()) diff --git a/module_common/build.gradle b/module_common/build.gradle index b929e9332f..b37fd4b0bd 100644 --- a/module_common/build.gradle +++ b/module_common/build.gradle @@ -25,6 +25,12 @@ android { renderscriptSupportModeEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" + /** + * Build Time 供区分 jenkins 打包时间用 + * IS_NIGHT_MODE_ON 供区分夜间模式功能是否启用 + */ + buildConfigField "long", "BUILD_TIME", "0" + buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true" } buildFeatures { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java index 1817a92da9..029f5d9755 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/activity/BaseActivity.java @@ -51,7 +51,6 @@ import com.gh.gamecenter.common.utils.NetworkUtils; import com.gh.gamecenter.common.utils.NightModeUtils; import com.gh.gamecenter.common.utils.PackageFlavorHelper; import com.gh.gamecenter.common.utils.ShareUtils; -import com.gh.gamecenter.core.provider.IBuildConfigProvider; import com.gh.gamecenter.core.provider.IDownloadManagerProvider; import com.gh.gamecenter.core.provider.IEntranceUtilsProvider; import com.gh.gamecenter.core.provider.IPackageInstallerProvider; @@ -189,8 +188,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy super.onResume(); startPageTime = System.currentTimeMillis(); - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig.getIsNightModeOn() + if (BuildConfig.IS_NIGHT_MODE_ON && !NightModeUtils.INSTANCE.getSystemMode() && mNightMode != NightModeUtils.INSTANCE.isNightMode(this)) { onNightModeChange(); @@ -289,8 +287,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy screenRootView.addView(view); screenRootView.addView(ll); - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig.getIsNightModeOn()) { + if (BuildConfig.IS_NIGHT_MODE_ON) { screenRootView.addView(getNightModeIndicatorView()); } @@ -569,8 +566,7 @@ public abstract class BaseActivity extends BaseAppCompatActivity implements Easy } protected void onNightModeChange() { - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig.getIsNightModeOn()) { + if (BuildConfig.IS_NIGHT_MODE_ON) { mNightMode = NightModeUtils.INSTANCE.isNightMode(this); TextView tv = findViewById(ID_NIGHT_INDICATOR); if (tv != null) { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java index aaeb2b206d..15f52ae6a4 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/base/fragment/BaseFragment.java @@ -20,19 +20,16 @@ import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; import androidx.recyclerview.widget.RecyclerView; -import com.alibaba.android.arouter.launcher.ARouter; import com.gh.gamecenter.common.BuildConfig; import com.gh.gamecenter.common.R; import com.gh.gamecenter.common.callback.OnListClickListener; import com.gh.gamecenter.common.callback.OnRequestCallBackListener; import com.gh.gamecenter.common.constant.Constants; -import com.gh.gamecenter.common.constant.RouteConsts; import com.gh.gamecenter.common.eventbus.EBMiPush; import com.gh.gamecenter.common.syncpage.ISyncAdapterHandler; import com.gh.gamecenter.common.syncpage.SyncDataEntity; import com.gh.gamecenter.common.syncpage.SyncPageRepository; import com.gh.gamecenter.common.utils.NightModeUtils; -import com.gh.gamecenter.core.provider.IBuildConfigProvider; import com.lightgame.OnTitleClickListener; import com.lightgame.utils.RuntimeUtils; import com.lightgame.utils.Utils; @@ -165,8 +162,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB if (addSyncPageObserver()) { initSyncPageObserver(); } - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig != null && buildConfig.getIsNightModeOn()) { + if (BuildConfig.IS_NIGHT_MODE_ON) { mNightMode = NightModeUtils.INSTANCE.isNightMode(requireContext()); } else { mNightMode = false; @@ -244,8 +240,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB isEverPause = false; startPageTime = System.currentTimeMillis(); - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig.getIsNightModeOn() + if (BuildConfig.IS_NIGHT_MODE_ON && !NightModeUtils.INSTANCE.getSystemMode() && mNightMode != NightModeUtils.INSTANCE.isNightMode(requireContext())) { onNightModeChange(); @@ -358,8 +353,7 @@ public abstract class BaseFragment extends Fragment implements OnRequestCallB public void onConfigurationChanged(@NonNull Configuration newConfig) { super.onConfigurationChanged(newConfig); - IBuildConfigProvider buildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); - if (buildConfig.getIsNightModeOn()) { + if (BuildConfig.IS_NIGHT_MODE_ON) { onNightModeChange(); } } diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt index 1c0b8e9994..c26d08c247 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/Extensions.kt @@ -458,8 +458,7 @@ fun throwExceptionInDebug(message: String = "", predicate: Boolean = true) { * 在自动打包的包里弹 toast */ fun toastInInternalRelease(content: String) { - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - if (buildConfig?.getBuildTime() != 0L) { + if (BuildConfig.BUILD_TIME != 0L) { Utils.toast(HaloApp.getInstance(), content) } } @@ -1245,8 +1244,7 @@ fun String.emojiCount(): Int { * WebView启用强制深色模式 */ fun WebView.enableForceDark(nightMode: Boolean) { - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - if (buildConfig?.getIsNightModeOn() == true && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { + if (BuildConfig.IS_NIGHT_MODE_ON && WebViewFeature.isFeatureSupported(WebViewFeature.FORCE_DARK)) { WebSettingsCompat.setForceDark(settings, if (nightMode) WebSettingsCompat.FORCE_DARK_ON else WebSettingsCompat.FORCE_DARK_OFF) } } @@ -1255,8 +1253,7 @@ fun WebView.enableForceDark(nightMode: Boolean) { * 日夜间模式切换更新状态栏底色 */ fun Activity.updateStatusBarColor(@ColorRes nightColor: Int, @ColorRes dayColor: Int) { - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - if (buildConfig?.getIsNightModeOn() == true) { + if (BuildConfig.IS_NIGHT_MODE_ON) { DisplayUtils.setStatusBarColor( this, if (NightModeUtils.isNightMode(this)) nightColor else dayColor diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt b/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt index d7d0c08cfd..867c1a7144 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/NightModeUtils.kt @@ -4,6 +4,7 @@ import android.content.Context import android.content.res.Configuration import androidx.appcompat.app.AppCompatDelegate import com.alibaba.android.arouter.launcher.ARouter +import com.gh.gamecenter.common.BuildConfig import com.gh.gamecenter.common.constant.Constants import com.gh.gamecenter.common.constant.RouteConsts import com.gh.gamecenter.core.provider.IBuildConfigProvider @@ -15,8 +16,7 @@ object NightModeUtils { */ fun isNightMode(context: Context): Boolean { // 仅配置开启的包才提供夜间模式功能 - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - return if (buildConfig?.getIsNightModeOn() == true) { + return if (BuildConfig.IS_NIGHT_MODE_ON) { val uiMode = context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK uiMode == Configuration.UI_MODE_NIGHT_YES } else { @@ -50,8 +50,7 @@ object NightModeUtils { */ fun initNightMode(systemMode: Boolean, nightMode: Boolean) { // 仅配置开启的包才提供夜间模式功能 - val buildConfig = ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation() as? IBuildConfigProvider - if (buildConfig?.getIsNightModeOn() == true) { + if (BuildConfig.IS_NIGHT_MODE_ON) { if (systemMode) { AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM) } else { diff --git a/module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java b/module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java index 18230501d2..36217e6242 100644 --- a/module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java +++ b/module_common/src/main/java/com/gh/gamecenter/common/utils/PackageFlavorHelper.java @@ -1,16 +1,12 @@ package com.gh.gamecenter.common.utils; -import com.alibaba.android.arouter.launcher.ARouter; -import com.gh.gamecenter.common.constant.RouteConsts; -import com.gh.gamecenter.core.provider.IBuildConfigProvider; +import com.gh.gamecenter.common.BuildConfig; public class PackageFlavorHelper { private PackageFlavorHelper() { } - private static final IBuildConfigProvider mBuildConfig = (IBuildConfigProvider) ARouter.getInstance().build(RouteConsts.provider.buildConfig).navigation(); // 包体是否为测试包 - public static final boolean IS_TEST_FLAVOR = mBuildConfig.getBuildTime() != 0L || mBuildConfig.isDebug(); - + public static final boolean IS_TEST_FLAVOR = BuildConfig.BUILD_TIME != 0L || BuildConfig.DEBUG; } diff --git a/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt b/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt index cca66cc35f..f073666036 100644 --- a/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt +++ b/module_core/src/main/java/com/gh/gamecenter/core/provider/IBuildConfigProvider.kt @@ -4,13 +4,18 @@ import com.alibaba.android.arouter.facade.template.IProvider interface IBuildConfigProvider : IProvider { fun getApplicationId(): String + fun getVersionName(): String + fun getExposureVersion(): String + fun isDebug(): Boolean - fun getBuildTime(): Long + fun getApiHost(): String + fun getDevApiHost(): String + fun getNewApiHost(): String + fun getNewDevApiHost(): String - fun getIsNightModeOn(): Boolean } \ No newline at end of file diff --git a/scripts/build_with_chucker_open.sh b/scripts/build_with_chucker_open.sh index 627a86469f..6e580b9e64 100755 --- a/scripts/build_with_chucker_open.sh +++ b/scripts/build_with_chucker_open.sh @@ -6,11 +6,11 @@ version=$(awk -v FS="versionName = " 'NF>1{print $2}' dependencies.gradle | sed build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties -sed -i '/debugImplementation "com.github.nichbar.chucker:library:${chucker}"/c\ implementation "com.github.nichbar.chucker:library:${chucker}"' app/build.gradle -sed -i '/releaseImplementation "com.github.nichbar.chucker:library-no-op:${chucker}"/c\' app/build.gradle +sed -i '/debugApi "com.github.nichbar.chucker:library:${chucker}"/c\ api "com.github.nichbar.chucker:library:${chucker}"' module_common/build.gradle +sed -i '/releaseApi "com.github.nichbar.chucker:library-no-op:${chucker}"/c\' module_common/build.gradle ./gradlew --stop ./gradlew clean @@ -23,7 +23,7 @@ cd .. cd .. sed -i "s/TINKER_ENABLE\=\(.*\)/TINKER_ENABLE\=1/g" gradle.properties -sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"$build_time_without_divider\""'/g' app/build.gradle +sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"$build_time_without_divider\""'/g' module_common/build.gradle ./gradlew rIR -I init.gradle mv app/build/outputs/apk/internal/release/app-internal-release.apk app/build/outputs/apk/internal/release/光环助手$version-测试环境-带请求日志-$build_time.apk @@ -31,5 +31,5 @@ mv app/build/outputs/apk/internal/release/app-internal-release.apk app/build/out ./gradlew rPR -I init.gradle mv app/build/outputs/apk/publish/release/app-publish-release.apk app/build/outputs/apk/publish/release/光环助手$version-正式环境-带请求日志-$build_time.apk -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties \ No newline at end of file diff --git a/scripts/build_with_simple_backup.sh b/scripts/build_with_simple_backup.sh index 6bf764053b..b6bb466f53 100755 --- a/scripts/build_with_simple_backup.sh +++ b/scripts/build_with_simple_backup.sh @@ -9,6 +9,8 @@ build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') # 重置 app build.gradle git checkout app/build.gradle +# 重置 module_common build.gradle +git checkout module_common/build.gradle # 移除夜间颜色资源 rm -r app/src/main/res/values-night @@ -27,7 +29,7 @@ rm -r module_core/src/main/res/drawable-night-xxxhdpi rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_core/src/main/res/values-night rm -r module_common/src/main/res/values-night -sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle +sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle ./gradlew --stop ./gradlew clean @@ -56,4 +58,6 @@ mkdir -p release-app/${versionName}_${versionCode} cp -R app/build/outputs/apk/publish/release/app-publish-release.apk release-app/${versionName}_${versionCode}/光环助手_${versionName}_${versionCode}_标准正式包_${git_sha}_${build_time}.apk # 重置 app build.gradle -git checkout app/build.gradle \ No newline at end of file +git checkout app/build.gradle +# 重置 module_common build.gradle +git checkout module_common/build.gradle \ No newline at end of file diff --git a/scripts/dokit_build.sh b/scripts/dokit_build.sh index 703c50acb4..db37ca4179 100755 --- a/scripts/dokit_build.sh +++ b/scripts/dokit_build.sh @@ -15,6 +15,7 @@ build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L ./gradlew clean git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties cd libraries/LGLibrary/ @@ -25,13 +26,13 @@ cd .. cd .. if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle + sed -i '' 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle ### jenkins 包添加 dokit 供设计师查看颜色啥的 sed -i '' '/debugImplementation "io.github.didi.dokit:dokitx:${dokit}"/c\ implementation "io.github.didi.dokit:dokitx:${dokit}"' app/build.gradle ### dokit 自带 okhttp 会破坏正式包的字节码修改 sed -i '' '/project.apply plugin: "com.gh.gamecenter.plugin"/c\ ' init.gradle else - sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle + sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle ### jenkins 包添加 dokit 供设计师查看颜色啥的 sed -i '/debugImplementation "io.github.didi.dokit:dokitx:${dokit}"/c\ implementation "io.github.didi.dokit:dokitx:${dokit}"' app/build.gradle ### dokit 自带 okhttp 会破坏正式包的字节码修改 @@ -43,4 +44,5 @@ mkdir -p test-app/${version_name}_${version_code} cp -R app/build/outputs/apk/internal/release/app-internal-release.apk test-app/${version_name}_${version_code}/光环助手_${version_name}_${version_code}_dokit调试包_${git_sha}_${build_time}.apk git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties \ No newline at end of file diff --git a/scripts/jenkins_build.sh b/scripts/jenkins_build.sh index 30661249f5..1cf089593a 100755 --- a/scripts/jenkins_build.sh +++ b/scripts/jenkins_build.sh @@ -7,7 +7,7 @@ versionCode=$(awk -v FS="versionCode = " 'NF>1{print $2}' dependencies.gradle | build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties ./gradlew --stop @@ -20,7 +20,7 @@ git pull origin master cd .. cd .. -sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle +sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle # 添加 -n 代表全局禁用夜间模式 while getopts "n" arg @@ -34,7 +34,7 @@ do rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_core/src/main/res/values-night rm -r module_common/src/main/res/values-night - sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle + sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle ;; esac done @@ -45,5 +45,5 @@ if [ ! -f app/build/outputs/apk/internal/release/app-internal-release.apk ]; the fi mv app/build/outputs/apk/internal/release/app-internal-release.apk app/build/tmp/${version}-${versionCode}-test-${build_time}.apk -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties \ No newline at end of file diff --git a/scripts/jenkins_flutter_build.sh b/scripts/jenkins_flutter_build.sh index b6e2bc85d8..d97952a165 100755 --- a/scripts/jenkins_flutter_build.sh +++ b/scripts/jenkins_flutter_build.sh @@ -11,7 +11,7 @@ versionCode=$(awk -v FS="versionCode = " 'NF>1{print $2}' dependencies.gradle | build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties if [[ "$OSTYPE" == "darwin"* ]]; then @@ -34,7 +34,7 @@ do rm -r module_common/src/main/res/drawable-night-xxxhdpi rm -r module_core/src/main/res/values-night rm -r module_common/src/main/res/values-night - sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' app/build.gradle + sed -i 's/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "true"/buildConfigField "boolean", "IS_NIGHT_MODE_ON", "false"/g' module_common/build.gradle ;; esac done @@ -48,7 +48,7 @@ cd .. ./gradlew --stop ./gradlew clean -sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle +sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle ./gradlew rIR -I init.flutter.gradle if [ ! -f app/build/outputs/apk/internal/release/app-internal-release.apk ]; then @@ -56,7 +56,7 @@ if [ ! -f app/build/outputs/apk/internal/release/app-internal-release.apk ]; the fi mv app/build/outputs/apk/internal/release/app-internal-release.apk app/build/tmp/${version}-${versionCode}-internal-${build_time}.apk -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties git checkout settings.gradle diff --git a/scripts/test_build.sh b/scripts/test_build.sh index 6446aefe59..c05ea38886 100755 --- a/scripts/test_build.sh +++ b/scripts/test_build.sh @@ -11,7 +11,7 @@ version_code=$(awk -v FS="versionCode = " 'NF>1{print $2}' dependencies.gradle | build_time=$(TZ=Asia/Shanghai date +'%Y-%m%d-%H%M') build_time_without_divider=$(TZ=Asia/Shanghai date +'%Y%m%d%H%M')L -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties ./gradlew --stop @@ -25,14 +25,14 @@ cd .. cd .. if [[ "$OSTYPE" == "darwin"* ]]; then - sed -i '' 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle + sed -i '' 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle else - sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' app/build.gradle + sed -i 's/buildConfigField "long", "BUILD_TIME", "0"/buildConfigField "long", "BUILD_TIME", '"\"${build_time_without_divider}\""'/g' module_common/build.gradle fi ./gradlew rIR -I init.gradle mkdir -p test-app/${version_name}_${version_code} cp -R app/build/outputs/apk/internal/release/app-internal-release.apk test-app/${version_name}_${version_code}/光环助手_${version_name}_${version_code}_测试包_${git_sha}_${build_time}.apk -git checkout app/build.gradle +git checkout module_common/build.gradle git checkout gradle.properties \ No newline at end of file