Merge pull request #13 from JustKiddingBaby/release-1.1.0

添加光标属性的支持
2018-11-01 11:18:14 +08:00 · 2018-11-01 11:15:58 +08:00 · 2018-10-31 10:37:45 +08:00 · 2018-10-30 19:32:52 +08:00 · 2018-05-22 10:19:59 +08:00 · 2018-05-21 23:30:24 +03:00
18 changed files with 120 additions and 257 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,8 +1,7 @@
 *.iml
 .gradle
 /local.properties
-/.idea/workspace.xml
-/.idea/libraries
+/.idea
 .DS_Store
 /build
 /captures
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <resourceExtensions />
-    <wildcardResourcePatterns>
-      <entry name="!?*.java" />
-      <entry name="!?*.form" />
-      <entry name="!?*.class" />
-      <entry name="!?*.groovy" />
-      <entry name="!?*.scala" />
-      <entry name="!?*.flex" />
-      <entry name="!?*.kt" />
-      <entry name="!?*.clj" />
-      <entry name="!?*.aj" />
-    </wildcardResourcePatterns>
-    <annotationProcessing>
-      <profile default="true" name="Default" enabled="false">
-        <processorPath useClasspath="true" />
-      </profile>
-    </annotationProcessing>
-  </component>
-</project>
--- a/.idea/copyright/profiles_settings.xml
+++ b/.idea/copyright/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="CopyrightManager">
-  <settings default="" />
-</component>
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="distributionType" value="DEFAULT_WRAPPED" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/app" />
-            <option value="$PROJECT_DIR$/vcedittext-lib" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
--- a/.idea/markdown-exported-files.xml
+++ b/.idea/markdown-exported-files.xml
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownExportedFiles">
-    <htmlFiles />
-    <imageFiles />
-    <otherFiles />
-  </component>
-</project>
--- a/.idea/markdown-navigator.xml
+++ b/.idea/markdown-navigator.xml
@@ -1,71 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MarkdownProjectSettings">
-    <PreviewSettings splitEditorLayout="SPLIT" splitEditorPreview="PREVIEW" useGrayscaleRendering="false" zoomFactor="1.0" maxImageWidth="0" showGitHubPageIfSynced="false" allowBrowsingInPreview="false" synchronizePreviewPosition="true" highlightPreviewType="NONE" highlightFadeOut="5" highlightOnTyping="true" synchronizeSourcePosition="true" verticallyAlignSourceAndPreviewSyncPosition="true" showSearchHighlightsInPreview="false" showSelectionInPreview="true">
-      <PanelProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.panel" providerName="Default - Swing" />
-      </PanelProvider>
-    </PreviewSettings>
-    <ParserSettings gitHubSyntaxChange="false">
-      <PegdownExtensions>
-        <option name="ABBREVIATIONS" value="false" />
-        <option name="ANCHORLINKS" value="true" />
-        <option name="ASIDE" value="false" />
-        <option name="ATXHEADERSPACE" value="true" />
-        <option name="AUTOLINKS" value="true" />
-        <option name="DEFINITIONS" value="false" />
-        <option name="DEFINITION_BREAK_DOUBLE_BLANK_LINE" value="false" />
-        <option name="FENCED_CODE_BLOCKS" value="true" />
-        <option name="FOOTNOTES" value="false" />
-        <option name="HARDWRAPS" value="false" />
-        <option name="INSERTED" value="false" />
-        <option name="QUOTES" value="false" />
-        <option name="RELAXEDHRULES" value="true" />
-        <option name="SMARTS" value="false" />
-        <option name="STRIKETHROUGH" value="true" />
-        <option name="SUBSCRIPT" value="false" />
-        <option name="SUPERSCRIPT" value="false" />
-        <option name="SUPPRESS_HTML_BLOCKS" value="false" />
-        <option name="SUPPRESS_INLINE_HTML" value="false" />
-        <option name="TABLES" value="true" />
-        <option name="TASKLISTITEMS" value="true" />
-        <option name="TOC" value="false" />
-        <option name="WIKILINKS" value="true" />
-      </PegdownExtensions>
-      <ParserOptions>
-        <option name="COMMONMARK_LISTS" value="true" />
-        <option name="DUMMY" value="false" />
-        <option name="EMOJI_SHORTCUTS" value="true" />
-        <option name="FLEXMARK_FRONT_MATTER" value="false" />
-        <option name="GFM_LOOSE_BLANK_LINE_AFTER_ITEM_PARA" value="false" />
-        <option name="GFM_TABLE_RENDERING" value="true" />
-        <option name="GITBOOK_URL_ENCODING" value="false" />
-        <option name="GITHUB_EMOJI_URL" value="false" />
-        <option name="GITHUB_LISTS" value="false" />
-        <option name="GITHUB_WIKI_LINKS" value="true" />
-        <option name="JEKYLL_FRONT_MATTER" value="false" />
-        <option name="SIM_TOC_BLANK_LINE_SPACER" value="true" />
-      </ParserOptions>
-    </ParserSettings>
-    <HtmlSettings headerTopEnabled="false" headerBottomEnabled="false" bodyTopEnabled="false" bodyBottomEnabled="false" embedUrlContent="false" addPageHeader="true">
-      <GeneratorProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.generator" providerName="Default Swing HTML Generator" />
-      </GeneratorProvider>
-      <headerTop />
-      <headerBottom />
-      <bodyTop />
-      <bodyBottom />
-    </HtmlSettings>
-    <CssSettings previewScheme="UI_SCHEME" cssUri="" isCssUriEnabled="false" isCssTextEnabled="false" isDynamicPageWidth="true">
-      <StylesheetProvider>
-        <provider providerId="com.vladsch.idea.multimarkdown.editor.swing.html.css" providerName="Default Swing Stylesheet" />
-      </StylesheetProvider>
-      <ScriptProviders />
-      <cssText />
-    </CssSettings>
-    <HtmlExportSettings updateOnSave="false" parentDir="$ProjectFileDir$" targetDir="$ProjectFileDir$" cssDir="" scriptDir="" plainHtml="false" imageDir="" copyLinkedImages="false" imageUniquifyType="0" targetExt="" useTargetExt="false" noCssNoScripts="false" linkToExportedHtml="true" exportOnSettingsChange="true" regenerateOnProjectOpen="false" />
-    <LinkMapSettings>
-      <textMaps />
-    </LinkMapSettings>
-  </component>
-</project>
--- a/.idea/markdown-navigator/profiles_settings.xml
+++ b/.idea/markdown-navigator/profiles_settings.xml
@@ -1,3 +0,0 @@
-<component name="MarkdownNavigator.ProfileManager">
-  <settings default="" pdf-export="" />
-</component>
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="EntryPointsManager">
-    <entry_points version="2.0" />
-  </component>
-  <component name="NullableNotNullManager">
-    <option name="myDefaultNullable" value="android.support.annotation.Nullable" />
-    <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
-    <option name="myNullables">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
-        </list>
-      </value>
-    </option>
-    <option name="myNotNulls">
-      <value>
-        <list size="4">
-          <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
-          <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
-          <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
-          <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
-        </list>
-      </value>
-    </option>
-  </component>
-  <component name="ProjectInspectionProfilesVisibleTreeState">
-    <entry key="Project Default">
-      <profile-state>
-        <expanded-state>
-          <State>
-            <id />
-          </State>
-          <State>
-            <id>Class structureJava</id>
-          </State>
-          <State>
-            <id>Code maturity issuesJava</id>
-          </State>
-          <State>
-            <id>Java</id>
-          </State>
-          <State>
-            <id>Java language level migration aidsJava</id>
-          </State>
-          <State>
-            <id>Javadoc issuesJava</id>
-          </State>
-          <State>
-            <id>Performance issuesJava</id>
-          </State>
-          <State>
-            <id>TestNGJava</id>
-          </State>
-          <State>
-            <id>Threading issuesJava</id>
-          </State>
-        </expanded-state>
-        <selected-state>
-          <State>
-            <id>Android</id>
-          </State>
-        </selected-state>
-      </profile-state>
-    </entry>
-  </component>
-  <component name="ProjectLevelVcsManager" settingsEditedManually="false">
-    <OptionsSetting value="true" id="Add" />
-    <OptionsSetting value="true" id="Remove" />
-    <OptionsSetting value="true" id="Checkout" />
-    <OptionsSetting value="true" id="Update" />
-    <OptionsSetting value="true" id="Status" />
-    <OptionsSetting value="true" id="Edit" />
-    <ConfirmationsSetting value="0" id="Add" />
-    <ConfirmationsSetting value="0" id="Remove" />
-  </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" assert-keyword="true" jdk-15="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
-    <output url="file://$PROJECT_DIR$/build/classes" />
-  </component>
-  <component name="ProjectType">
-    <option name="id" value="Android" />
-  </component>
-</project>
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/VercodeEditText.iml" filepath="$PROJECT_DIR$/VercodeEditText.iml" />
-      <module fileurl="file://$PROJECT_DIR$/VercodeEditText.iml" filepath="$PROJECT_DIR$/VercodeEditText.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/vcedittext-lib/vcedittext-lib.iml" filepath="$PROJECT_DIR$/vcedittext-lib/vcedittext-lib.iml" />
-      <module fileurl="file://$PROJECT_DIR$/vcedittext-lib/vcedittext-lib.iml" filepath="$PROJECT_DIR$/vcedittext-lib/vcedittext-lib.iml" />
-    </modules>
-  </component>
-</project>
--- a/.idea/runConfigurations.xml
+++ b/.idea/runConfigurations.xml
@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RunConfigurationProducerService">
-    <option name="ignoredProducers">
-      <set>
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.AllInPackageGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestClassGradleConfigurationProducer" />
-        <option value="org.jetbrains.plugins.gradle.execution.test.runner.TestMethodGradleConfigurationProducer" />
-      </set>
-    </option>
-  </component>
-</project>
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>
--- a/README-CN.md
+++ b/README-CN.md
@@ -18,6 +18,7 @@
 - [x] **提供输入内容的监听器**  
 - [x] **高度自适配**  
 - [x] **属性自定义配置**  
+- [x] **光标属性自定义**

 ## 版本
 名称|SlideMenuLayout
@@ -43,7 +44,7 @@ repositories {
 ```
 第二步，添加至module的build.gradle文件中
 ```gradle
-compile 'com.justkiddingbaby:vercodeedittext:最新版本'
+'com.justkiddingbaby:vercodeedittext:最新版本'
 ```

 ## 属性说明
@@ -55,6 +56,9 @@ compile 'com.justkiddingbaby:vercodeedittext:最新版本'
 [bottomLineNormalColor](/vcedittext-lib/src/main/res/values/attrs.xml)|底线未选中状态下的颜色|reference
 [bottomLineHeight](/vcedittext-lib/src/main/res/values/attrs.xml)|底线高度|dimension
 [selectedBackgroundColor](/vcedittext-lib/src/main/res/values/attrs.xml)|选中的背景颜色|reference
+[cursorDuration](/vcedittext-lib/src/main/res/values/attrs.xml)|光标闪烁间隔时间|integer
+[cursorColor](/vcedittext-lib/src/main/res/values/attrs.xml)|光标颜色|integer
+[cursorWidth](/vcedittext-lib/src/main/res/values/attrs.xml)|光标宽度|integer

 ## 方法说明
 返回值|方法|说明
@@ -86,6 +90,12 @@ void|[setOnVerificationCodeChangedListener(OnVerificationCodeChangedListener lis
 ```
 
 ## 发布历史
+ #### v1.1.0 (2018/11/1)
+ 1、添加光标属性的支持.
+ #### v1.0.5(2017/12/5)
+ 1、修复在点击控件时候可以遇到的Bug  
+ #### v1.0.4(2017/10/14)
+ 1、在AndroidManifest.xml中移除label节点.  
 #### v1.0.3(2017/8/15)
 1、让接口类VerificationAction变为public.  
 #### v1.0.2(2017/6/29)
--- a/README.md
+++ b/README.md
@@ -19,6 +19,7 @@ Prevent input overflow.
 - [x] **Provide input value listener**  
 - [x] **Layout height is auto adjust**  
 - [x] **Attributes can be configured for customization**  
+- [x] **Custom cursor style**

 ## Version
 name|VercodeEditText
@@ -44,7 +45,7 @@ repositories {
 ```
 Second. add to module build.gradle
 ```gradle
-compile 'com.justkiddingbaby:vercodeedittext:the latest version'
+'com.justkiddingbaby:vercodeedittext:the latest version'
 ```

 ## Attributes instruction
@@ -56,6 +57,9 @@ attribute|instruction|value
 [bottomLineNormalColor](/vcedittext-lib/src/main/res/values/attrs.xml)|the color of bottom line is normal status|reference
 [bottomLineHeight](/vcedittext-lib/src/main/res/values/attrs.xml)|the height of bottom line|dimension
 [selectedBackgroundColor](/vcedittext-lib/src/main/res/values/attrs.xml)|the background color of verification code is select status|reference
+[cursorDuration](/vcedittext-lib/src/main/res/values/attrs.xml)|the duration of cursor blink|integer
+[cursorColor](/vcedittext-lib/src/main/res/values/attrs.xml)|the color of cursor|integer
+[cursorWidth](/vcedittext-lib/src/main/res/values/attrs.xml)|the width of cursor|integer

 ## Function instruction
 return|function name|instruction
@@ -87,6 +91,12 @@ void|[setOnVerificationCodeChangedListener(OnVerificationCodeChangedListener lis
 ```
 
 ## Release history
+#### v1.1.0 (2018/11/1)
+1、Add cursor support.
+#### v1.0.5(2017/12/5)
+1、Fix the bug that could appear when the view is pressed.
+#### v1.0.4(2017/10/14)
+1、Remove label element at AndroidManifest.xml.  
 #### v1.0.3(2017/8/15)
 1、make interface class VerificationAction public.  
 #### v1.0.2(2017/6/29)
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -7,17 +7,18 @@
    android:orientation="vertical">

    <com.jkb.vcedittext.VerificationCodeEditText
+        android:id="@+id/am_et"
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="20dp"
        android:inputType="number"
        android:text="123"
-        android:id="@+id/am_et"
        android:textColor="@color/colorPrimary"
        android:textSize="40sp"
        app:bottomLineHeight="2dp"
        app:bottomLineNormalColor="@color/gravy_light"
        app:bottomLineSelectedColor="@color/colorAccent"
+        app:cursorColor="@android:color/holo_purple"
        app:figures="4"
        app:selectedBackgroundColor="@color/colorPrimary_alpha33"
        app:verCodeMargin="10dp"/>
@@ -26,6 +27,7 @@
        android:layout_width="match_parent"
        android:layout_height="wrap_content"
        android:layout_margin="20dp"
+        android:cursorVisible="false"
        android:inputType="number"
        android:text="1234"
        android:textColor="@color/colorPrimary"
@@ -48,6 +50,8 @@
        app:bottomLineHeight="2dp"
        app:bottomLineNormalColor="@color/gravy_light"
        app:bottomLineSelectedColor="@color/colorAccent"
+        app:cursorColor="@android:color/white"
+        app:cursorWidth="2dp"
        app:figures="6"
        app:selectedBackgroundColor="@color/colorPrimary_alpha33"
        app:verCodeMargin="10dp"/>
--- a/config.gradle
+++ b/config.gradle
@@ -6,8 +6,8 @@ ext {
    ]

    vercode = [
-            publishCode   : 4,
-            publishVersion: "1.0.3",
+            publishCode   : 7,
+            publishVersion: "1.1.0",

            userOrg       : 'jkb',
            groupId       : 'com.justkiddingbaby',
--- a/vcedittext-lib/src/main/AndroidManifest.xml
+++ b/vcedittext-lib/src/main/AndroidManifest.xml
@@ -1,9 +1,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-
          package="com.jkb.vcedittext">

-    <application
-        android:label="@string/app_name">
+    <application>

    </application>

--- a/vcedittext-lib/src/main/java/com/jkb/vcedittext/VerificationCodeEditText.java
+++ b/vcedittext-lib/src/main/java/com/jkb/vcedittext/VerificationCodeEditText.java
@@ -4,6 +4,7 @@ import android.content.Context;
 import android.content.res.TypedArray;
 import android.graphics.Canvas;
 import android.graphics.Paint;
+import android.os.Build;
 import android.support.annotation.ColorRes;
 import android.support.v4.content.ContextCompat;
 import android.text.Editable;
@@ -12,7 +13,12 @@ import android.text.TextWatcher;
 import android.util.AttributeSet;
 import android.util.DisplayMetrics;
 import android.util.TypedValue;
+import android.view.MotionEvent;
 import android.view.WindowManager;
+import android.view.inputmethod.InputMethodManager;
+
+import java.util.Timer;
+import java.util.TimerTask;


 /**
@@ -22,6 +28,7 @@ import android.view.WindowManager;

 public class VerificationCodeEditText extends android.support.v7.widget.AppCompatEditText implements
        VerificationAction, TextWatcher {
+    private static final int DEFAULT_CURSOR_DURATION = 400;

    private int mFigures;//需要输入的位数
    private int mVerCodeMargin;//验证码之间的间距
@@ -29,6 +36,9 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
    private int mBottomNormalColor;//未选中的颜色
    private float mBottomLineHeight;//底线的高度
    private int mSelectedBackgroundColor;//选中的背景颜色
+    private int mCursorWidth;//光标宽度
+    private int mCursorColor;//光标颜色
+    private int mCursorDuration;//光标闪烁间隔

    private OnVerificationCodeChangedListener onCodeChangedListener;
    private int mCurrentPosition = 0;
@@ -37,6 +47,12 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
    private Paint mNormalBackgroundPaint;
    private Paint mBottomSelectedPaint;
    private Paint mBottomNormalPaint;
+    private Paint mCursorPaint;
+
+    // 控制光标闪烁
+    private boolean isCursorShowing;
+    private TimerTask mCursorTimerTask;
+    private Timer mCursorTimer;

    public VerificationCodeEditText(Context context) {
        this(context, null);
@@ -51,6 +67,7 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
        initAttrs(attrs);
        setBackgroundColor(ContextCompat.getColor(context, android.R.color.transparent));//防止出现下划线
        initPaint();
+        initCursorTimer();
        setFocusableInTouchMode(true);
        super.addTextChangedListener(this);
    }
@@ -70,6 +87,12 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
        mBottomNormalPaint.setColor(mBottomNormalColor);
        mBottomSelectedPaint.setStrokeWidth(mBottomLineHeight);
        mBottomNormalPaint.setStrokeWidth(mBottomLineHeight);
+
+        mCursorPaint = new Paint();
+        mCursorPaint.setAntiAlias(true);
+        mCursorPaint.setColor(mCursorColor);
+        mCursorPaint.setStyle(Paint.Style.FILL_AND_STROKE);
+        mCursorPaint.setStrokeWidth(mCursorWidth);
    }

    /**
@@ -87,13 +110,46 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
                dp2px(5));
        mSelectedBackgroundColor = ta.getColor(R.styleable.VerCodeEditText_selectedBackgroundColor,
                getColor(android.R.color.darker_gray));
+        mCursorWidth = (int) ta.getDimension(R.styleable.VerCodeEditText_cursorWidth, dp2px(1));
+        mCursorColor = ta.getColor(R.styleable.VerCodeEditText_cursorColor, getColor(android.R.color.darker_gray));
+        mCursorDuration = ta.getInteger(R.styleable.VerCodeEditText_cursorDuration, DEFAULT_CURSOR_DURATION);
        ta.recycle();
+        
+        // force LTR because of bug: https://github.com/JustKiddingBaby/VercodeEditText/issues/4
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1) {
+            setLayoutDirection(LAYOUT_DIRECTION_LTR);
+        }
    }

+    private void initCursorTimer() {
+        mCursorTimerTask = new TimerTask() {
+            @Override
+            public void run() {
+                // 通过光标间歇性显示实现闪烁效果
+                isCursorShowing = !isCursorShowing;
+                postInvalidate();
+            }
+        };
+        mCursorTimer = new Timer();
+    }
+
+    @Override
+    protected void onAttachedToWindow() {
+        super.onAttachedToWindow();
+
+        // 启动定时任务，定时刷新实现光标闪烁
+        mCursorTimer.scheduleAtFixedRate(mCursorTimerTask, 0, mCursorDuration);
+    }
+
+    @Override
+    protected void onDetachedFromWindow() {
+        super.onDetachedFromWindow();
+        mCursorTimer.cancel();
+    }

    @Override
    final public void setCursorVisible(boolean visible) {
-        super.setCursorVisible(false);//隐藏光标的显示
+        super.setCursorVisible(visible);//隐藏光标的显示
    }

    @Override
@@ -120,6 +176,17 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
        setMeasuredDimension(widthResult, heightResult);
    }

+    @Override
+    public boolean onTouchEvent(MotionEvent event) {
+        if (event.getAction() == MotionEvent.ACTION_DOWN) {
+            requestFocus();
+            setSelection(getText().length());
+            showKeyBoard(getContext());
+            return false;
+        }
+        return super.onTouchEvent(event);
+    }
+
    @Override
    protected void onDraw(Canvas canvas) {
        mCurrentPosition = getText().length();
@@ -165,6 +232,16 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
            }
            canvas.restore();
        }
+        //绘制光标
+        if (!isCursorShowing && isCursorVisible() && mCurrentPosition < mFigures && hasFocus()) {
+            canvas.save();
+            int startX = mCurrentPosition * (width + mVerCodeMargin) + width / 2;
+            int startY = height / 4;
+            int endX = startX;
+            int endY = height - height / 4;
+            canvas.drawLine(startX, startY, endX, endY, mCursorPaint);
+            canvas.restore();
+        }
    }

    @Override
@@ -260,4 +337,9 @@ public class VerificationCodeEditText extends android.support.v7.widget.AppCompa
        wm.getDefaultDisplay().getMetrics(metrics);
        return metrics.widthPixels;
    }
+
+    public void showKeyBoard(Context context) {
+        InputMethodManager imm = (InputMethodManager) context.getSystemService(Context.INPUT_METHOD_SERVICE);
+        imm.showSoftInput(this, InputMethodManager.SHOW_FORCED);
+    }
 }
--- a/vcedittext-lib/src/main/res/values/attrs.xml
+++ b/vcedittext-lib/src/main/res/values/attrs.xml
@@ -8,5 +8,8 @@
        <attr name="bottomLineNormalColor" format="reference" />
        <attr name="bottomLineHeight" format="dimension" />
        <attr name="selectedBackgroundColor" format="reference" />
+        <attr name="cursorDuration" format="integer" />
+        <attr name="cursorWidth" format="dimension" />
+        <attr name="cursorColor" format="color|reference" />
    </declare-styleable>
 </resources>
Author	SHA1	Message	Date
JingYeoh	3db397ef2a	Merge pull request #13 from JustKiddingBaby/release-1.1.0 添加光标属性的支持	2018-11-01 11:18:14 +08:00
yangjing	d2f0bd3ed4	添加光标属性的支持	2018-11-01 11:15:58 +08:00
JingYeoh	88d66b068e	Merge pull request #12 from XthPasserby/master 添加光标支持：	2018-10-31 10:37:45 +08:00
XthPasserby	9f7dfcd8c3	添加光标支持： cursorDuration: 闪烁间隔（毫秒） cursorWidth：光标宽度 cursorColor：光标颜色	2018-10-30 19:32:52 +08:00
JingYeoh	49f205e01b	Merge pull request #7 from Hamdy-khader/master Force LTR to avoid blank view in RTL layout	2018-05-22 10:19:59 +08:00
Hamdy H. Khader	c9ac98d09d	Force LTR to avoid blank view in RTL layout Fixes #4	2018-05-21 23:30:24 +03:00
justkiddingbaby	9f90fe7dda	👊Update the version to "1.1.5";	2017-12-05 09:44:18 +08:00
JingYeoh	6e093130a8	Merge pull request #3 from Blankeer/master intercept the down press action	2017-12-05 09:20:52 +08:00
Blanke	87fd6b3a1c	[FIX] disable context menu when long click,fix number disorder when click index.	2017-12-04 11:41:57 +08:00
JingYeoh	6a2f7a1a85	:hammar:release v1.0.4	2017-10-14 20:14:51 +08:00