diff --git a/app/build.gradle b/app/build.gradle index b1e6563..d4d5c2f 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,6 +1,21 @@ apply plugin: 'com.android.application' android { + + signingConfigs { + debug { + storeFile file('/ruijapkkey') + storePassword 'ruijie888888' + keyAlias 'ruijie' + keyPassword 'ruijie888888' + } + release { + storeFile file('/ruijapkkey') + storePassword 'ruijie888888' + keyAlias 'ruijie' + keyPassword 'ruijie888888' + } + } compileSdkVersion 29 buildToolsVersion "29.0.3" defaultConfig { @@ -25,8 +40,21 @@ android { } buildTypes { release { - minifyEnabled false - proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' + zipAlignEnabled true + debuggable false +// minifyEnabled true //是否混淆 +// shrinkResources true //是否去除无效的资源文件 + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.release + } + debug { + debuggable true + zipAlignEnabled true + debuggable true +// minifyEnabled false //是否混淆,注意release出现的bug有可能是因为混淆造成的 +// shrinkResources false //是否去除无效的资源文件 + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + signingConfig signingConfigs.debug } } lintOptions { @@ -47,6 +75,20 @@ android { pickFirst 'lib/x86_64/libc++_shared.so' } } +android.applicationVariants.all { + variant -> + variant.outputs.all { output -> + if (variant.buildType.name == 'debug') { + output.outputFileName = "unionhealthTV_${android.defaultConfig.versionName}_${getNowTime()}_debug.apk" + } else if (variant.buildType.name == 'release') { + output.outputFileName = "unionhealthTV_${android.defaultConfig.versionName}_${getNowTime()}_release.apk" + } + } +} + +static def getNowTime() { + return new Date().format("MM-dd_HH.mm") +} dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) diff --git a/app/ruijapkkey b/app/ruijapkkey new file mode 100644 index 0000000..6685003 Binary files /dev/null and b/app/ruijapkkey differ diff --git a/app/src/main/res/layout/activity_group_detail.xml b/app/src/main/res/layout/activity_group_detail.xml index e13908a..10d1d22 100644 --- a/app/src/main/res/layout/activity_group_detail.xml +++ b/app/src/main/res/layout/activity_group_detail.xml @@ -9,6 +9,7 @@ android:layout_height="match_parent" android:orientation="vertical" android:layout_weight="3" + android:background="@mipmap/translucent_bg" > diff --git a/app/src/main/res/mipmap-xhdpi/icon_mute.png b/app/src/main/res/mipmap-xhdpi/icon_mute.png deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/res/mipmap-xhdpi/translucent_bg.png b/app/src/main/res/mipmap-xhdpi/translucent_bg.png new file mode 100644 index 0000000..ac86066 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/translucent_bg.png differ