From 123be7b5aae631385826b24ea0a8550e12e0b0e1 Mon Sep 17 00:00:00 2001 From: qinci Date: Sun, 11 Dec 2016 22:43:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E6=97=B6=E5=85=89=E6=A0=87=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98=20(fixed=20#2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- gradle/push.gradle | 2 +- lib/build.gradle | 4 ++-- lib/src/main/java/ren/qinc/edit/PerformEdit.java | 8 ++++++-- 4 files changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index c0153f1..6d901ea 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ####EditText的撤销和恢复撤销操作 #####使用 * 引入库 - * compile 'ren.qinc.edit:lib:0.0.3' + * compile 'ren.qinc.edit:lib:0.0.4' * 初始化 ```java diff --git a/gradle/push.gradle b/gradle/push.gradle index fc996c2..f55d1e4 100644 --- a/gradle/push.gradle +++ b/gradle/push.gradle @@ -1,7 +1,7 @@ //参考http://www.jianshu.com/p/0ba8960f80a9 apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "0.0.3" +version = "0.0.4" def siteUrl = 'https://github.com/qinci/AndroidEdit' // 项目的主页 def gitUrl = 'https://github.com/qinci/AndroidEdit.git' // Git仓库的url diff --git a/lib/build.gradle b/lib/build.gradle index 99d4303..af6037c 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 9 targetSdkVersion 23 - versionCode 2 - versionName "1.2" + versionCode 3 + versionName "1.3" } buildTypes { release { diff --git a/lib/src/main/java/ren/qinc/edit/PerformEdit.java b/lib/src/main/java/ren/qinc/edit/PerformEdit.java index e23cc88..6c17480 100644 --- a/lib/src/main/java/ren/qinc/edit/PerformEdit.java +++ b/lib/src/main/java/ren/qinc/edit/PerformEdit.java @@ -84,7 +84,11 @@ public final void undo() { } else { //插销删除 editable.insert(action.startCursor, action.actionTarget); - editText.setSelection(action.startCursor, action.endCursor); + if (action.endCursor == action.startCursor) { + editText.setSelection(action.startCursor + action.actionTarget.length()); + } else { + editText.setSelection(action.startCursor, action.endCursor); + } } //释放操作 flag = false; @@ -151,7 +155,7 @@ public final void beforeTextChanged(CharSequence s, int start, int count, int af if (count > 1) { //如果一次超过一个字符，说名用户选择了，然后替换或者删除操作 action.setSelectCount(count); - }else if(count==1&&count==after){ + } else if (count == 1 && count == after) { //一个字符替换 action.setSelectCount(count); } From 0c4fa2e6cc1c7de5401be488e8ea73050ff75620 Mon Sep 17 00:00:00 2001 From: qinci Date: Thu, 15 Dec 2016 12:18:45 +0800 Subject: [PATCH 2/4] no message --- gradle/push.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gradle/push.gradle b/gradle/push.gradle index fc996c2..4deacf8 100644 --- a/gradle/push.gradle +++ b/gradle/push.gradle @@ -3,7 +3,7 @@ apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' version = "0.0.3" -def siteUrl = 'https://github.com/qinci/AndroidEdit' // 项目的主页 +def siteUrl = 'https://github.com/qinci/AndroidEdit' // 项目的主页 def gitUrl = 'https://github.com/qinci/AndroidEdit.git' // Git仓库的url group = "ren.qinc.edit" // Maven Group ID for the artifact， install { From 9510a1e30cc9fcf362686a30a2f220d3f0799285 Mon Sep 17 00:00:00 2001 From: qinci Date: Thu, 15 Dec 2016 12:32:38 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=20=E4=BF=AE=E5=A4=8D=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=96=87=E5=AD=97=E8=BF=9B=E8=A1=8C=E6=92=A4=E9=94=80=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=20=E6=81=A2=E5=A4=8D=E6=97=B6=E7=9A=84=E5=85=89?= =?UTF-8?q?=E6=A0=87=E9=97=AE=E9=A2=98(fixed=20#2)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- lib/src/main/java/ren/qinc/edit/PerformEdit.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/src/main/java/ren/qinc/edit/PerformEdit.java b/lib/src/main/java/ren/qinc/edit/PerformEdit.java index 6c17480..cbef1c2 100644 --- a/lib/src/main/java/ren/qinc/edit/PerformEdit.java +++ b/lib/src/main/java/ren/qinc/edit/PerformEdit.java @@ -110,7 +110,11 @@ public final void redo() { if (action.isAdd) { //恢复添加 editable.insert(action.startCursor, action.actionTarget); - editText.setSelection(action.startCursor, action.endCursor); + if (action.endCursor == action.startCursor) { + editText.setSelection(action.startCursor + action.actionTarget.length()); + } else { + editText.setSelection(action.startCursor, action.endCursor); + } } else { //恢复删除 editable.delete(action.startCursor, action.startCursor + action.actionTarget.length()); From b7eecef293821ba093227fab6956496f083e235b Mon Sep 17 00:00:00 2001 From: qinci Date: Thu, 15 Dec 2016 12:36:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E5=8F=B7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 2 +- gradle/push.gradle | 2 +- lib/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 6d901ea..f9dec51 100755 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ ####EditText的撤销和恢复撤销操作 #####使用 * 引入库 - * compile 'ren.qinc.edit:lib:0.0.4' + * compile 'ren.qinc.edit:lib:0.0.5' * 初始化 ```java diff --git a/gradle/push.gradle b/gradle/push.gradle index 7891853..8223870 100644 --- a/gradle/push.gradle +++ b/gradle/push.gradle @@ -1,7 +1,7 @@ //参考http://www.jianshu.com/p/0ba8960f80a9 apply plugin: 'com.github.dcendents.android-maven' apply plugin: 'com.jfrog.bintray' -version = "0.0.4" +version = "0.0.5" def siteUrl = 'https://github.com/qinci/AndroidEdit' // 项目的主页 def gitUrl = 'https://github.com/qinci/AndroidEdit.git' // Git仓库的url diff --git a/lib/build.gradle b/lib/build.gradle index af6037c..a2c1b37 100644 --- a/lib/build.gradle +++ b/lib/build.gradle @@ -6,8 +6,8 @@ android { defaultConfig { minSdkVersion 9 targetSdkVersion 23 - versionCode 3 - versionName "1.3" + versionCode 4 + versionName "1.4" } buildTypes { release {