release to 1.1.4

Tencent · Jun 6, 2018 · e23da79 · e23da79
1 parent ff144a9
commit e23da79
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/qmui/build.gradle b/qmui/build.gradle
@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 group = 'com.qmuiteam'
-version = "1.1.3" // QMUI 发布到 bintray 的版本号
+version = "1.1.4" // QMUI 发布到 bintray 的版本号
 
 //noinspection GroovyMissingReturnStatement
 android {

diff --git a/qmuidemo/build.gradle b/qmuidemo/build.gradle
@@ -25,7 +25,7 @@ android {
         minSdkVersion parent.ext.minSdkVersion
         targetSdkVersion parent.ext.targetSdkVersion
         versionCode gitVersion
-        versionName "1.1.3"
+        versionName "1.1.4"
     }
     buildTypes {
         debug {

diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/manager/QDUpgradeManager.java b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/manager/QDUpgradeManager.java
@@ -14,7 +14,8 @@ public class QDUpgradeManager {
     public static final int VERSION_1_1_1 = 111;
     public static final int VERSION_1_1_2 = 112;
     public static final int VERSION_1_1_3 = 113;
-    private static final int sCurrentVersion = VERSION_1_1_3;
+    public static final int VERSION_1_1_4 = 114;
+    private static final int sCurrentVersion = VERSION_1_1_4;
     private static QDUpgradeManager sQDUpgradeManager = null;
     private UpgradeTipTask mUpgradeTipTask;
 

diff --git a/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/manager/UpgradeTipTask.java b/qmuidemo/src/main/java/com/qmuiteam/qmuidemo/manager/UpgradeTipTask.java
@@ -49,7 +49,18 @@ private void appendBlockSpace(Context context, SpannableStringBuilder builder) {
 
     public CharSequence getUpgradeWord(final Activity activity) {
         SpannableStringBuilder text = new SpannableStringBuilder();
-        if(mNewVersion == QDUpgradeManager.VERSION_1_1_3){
+        if (mNewVersion == QDUpgradeManager.VERSION_1_1_4) {
+            text.append("1. Added a new widget: QMUIPriorityLinearLayout.\n");
+            appendBlockSpace(activity, text);
+            text.append("2. Bug fix: marginRight does not make sense for controlling " +
+                    "the position of signCount, it should use marginLeft.\n");
+            appendBlockSpace(activity, text);
+            text.append("3. Issue fixes: ");
+            final String[] issues = new String[]{
+                    "165", "247"
+            };
+            handleIssues(activity, text, issues);
+        } else if (mNewVersion == QDUpgradeManager.VERSION_1_1_3) {
             text.append("1. Feature: delay validation of QMUIFragment.canDragBack() until a pop " +
                     "gesture occurs. This feature allows you to control pop gesture on the fly.\n");
             appendBlockSpace(activity, text);
@@ -61,7 +72,7 @@ public CharSequence getUpgradeWord(final Activity activity) {
                     "254", "258", "284", "285", "293", "294"
             };
             handleIssues(activity, text, issues);
-        } else if(mNewVersion == QDUpgradeManager.VERSION_1_1_2) {
+        } else if (mNewVersion == QDUpgradeManager.VERSION_1_1_2) {
             text.append("1. Updated arch library to 0.0.4 to fix issue #235.\n");
             appendBlockSpace(activity, text);
             text.append("2. Added API to get line count in QMUIFloatLayout");
@@ -89,7 +100,7 @@ public CharSequence getUpgradeWord(final Activity activity) {
         return text;
     }
 
-    private void handleIssues(final Activity activity, SpannableStringBuilder text,  String[] issues){
+    private void handleIssues(final Activity activity, SpannableStringBuilder text, String[] issues) {
         final String issueBaseUrl = "https://github.com/QMUI/QMUI_Android/issues/";
         int start, end;
         for (int i = 0; i < issues.length; i++) {