diff --git a/app/build.gradle b/app/build.gradle index e91a179..7fe84bb 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -54,13 +54,13 @@ android { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' signingConfig signingConfigs.release -// android.applicationVariants.all { variant -> -// variant.outputs.all { output -> -// def sourceFile = "app-release" -// def replaceFile = "app-yixiong_v${defaultConfig.versionName}" -// outputFileName = output.outputFile.name.replace(sourceFile, replaceFile) -// } -// } + android.applicationVariants.all { variant -> + variant.outputs.all { output -> + def sourceFile = "app-release" + def replaceFile = "app-xinjiang_user_v${defaultConfig.versionName}" + outputFileName = output.outputFile.name.replace(sourceFile, replaceFile) + } + } } diff --git a/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt b/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt index ec45fdc..bc3dc78 100644 --- a/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt +++ b/app/src/main/java/com/xjjk/healthyclients/ui/activity/UserSettingActivity.kt @@ -4,6 +4,7 @@ import android.os.Bundle import android.view.View import com.sw.healthyclients.data.local.DataStoreManager import com.xjjk.healthyclients.AppViewModel +import com.xjjk.healthyclients.BuildConfig import com.xjjk.healthyclients.R import com.xjjk.healthyclients.base.BaseVMBActivity import com.xjjk.healthyclients.databinding.ActivitySettingBinding @@ -22,6 +23,8 @@ class UserSettingActivity : settingEditPassword.setOrderStateInfo("账号与安全(修改密码)",0,View.GONE) settingUserAgreement.setOrderStateInfo("用户协议",0,View.VISIBLE) settingUserPrivacyPolicy.setOrderStateInfo("隐私政策",0,View.VISIBLE) + settingVersion.setOrderStateInfo("当前版本",0,View.VISIBLE,false, "v"+BuildConfig.VERSION_NAME) + } } diff --git a/app/src/main/res/layout/activity_setting.xml b/app/src/main/res/layout/activity_setting.xml index 4bc7880..5bc2911 100644 --- a/app/src/main/res/layout/activity_setting.xml +++ b/app/src/main/res/layout/activity_setting.xml @@ -43,6 +43,11 @@ android:layout_marginLeft="@dimen/dp_12" android:layout_width="match_parent" android:layout_height="wrap_content"/> + \ No newline at end of file diff --git a/config.gradle b/config.gradle index c09e247..514234c 100644 --- a/config.gradle +++ b/config.gradle @@ -2,8 +2,8 @@ ext { minSdkVersion = 26 targetSdkVersion = 32 compileSdkVersion = 33 - versionCode = 10 - versionName = "3.0.10" + versionCode = 100 + versionName = "1.0.0" //Dependencies junitVersion = "4.12" lifecycleVersion = "2.6.0-alpha01"