From 75e83be13a8c4ccf081c4dc07a262e4096783c7e Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 02 Nov 2018 17:34:21 +0800
Subject: [PATCH] [*]修改电磁版本 配合电子修改bug

---
 app/build.gradle |   41 +++++++++++++++++++++++++++--------------
 1 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 1aacbde..1460c65 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -2,36 +2,49 @@
 
 android {
     compileSdkVersion 25
-    buildToolsVersion "25.0.2"
+    buildToolsVersion '26.0.2'
     defaultConfig {
         applicationId "com.moral.yunfushao"
-        minSdkVersion 18
-        targetSdkVersion 22
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion 21
+        targetSdkVersion 25
+        versionCode 2
+        versionName "1.0.2_sp3"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        signingConfig signingConfigs.debug
     }
-
     signingConfigs {
-        // your debug keystore
-        debug {
-            keyAlias 'moral'
-            keyPassword 'moral123456'
-            storeFile file("C:\\Users\\haijiang\\Desktop\\key\\key.jks")
-            storePassword 'moral123456'
+        key {
+            keyAlias 'qxpc'
+            keyPassword '123456'
+            storeFile file('../pregnancy_guard_android/qixingpiaochong')
+            storePassword '123456'
         }
     }
-
     sourceSets {
         main {
             jniLibs.srcDirs = ['libs']
+        }
+    }
+    //���������������
+    //3.0������
+    android.applicationVariants.all { variant ->
+        variant.outputs.all {
+            if (buildType.name == "debug")
+                outputFileName = "Dev_yfs_v.${variant.versionName}.apk"
+            else outputFileName = "yfs_v.${variant.versionName}.apk"
         }
     }
 
     buildTypes {
         release {
             minifyEnabled false
+            zipAlignEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+            manifestPlaceholders = [app_name: "@string/app_name"]//������������
+        }
+        debug {
+            minifyEnabled false
+            manifestPlaceholders = [app_name: "@string/app_name_text"]
         }
     }
 }
@@ -53,7 +66,7 @@
     compile 'com.github.bumptech.glide:glide:3.7.0'
     //������������
     compile 'com.lzy.net:okgo:2.1.4'
-     compile files('libs/BaiduLBS_Android.jar')
+    compile files('libs/BaiduLBS_Android.jar')
     compile 'pub.devrel:easypermissions:0.4.0'
     compile 'com.daimajia.numberprogressbar:library:1.4@aar'
     compile 'org.greenrobot:eventbus:3.0.0'

--
Gitblit v1.8.0