From 3a94631cfc1f93bdd01faac3e03c92275e5ce3c4 Mon Sep 17 00:00:00 2001
From: jiaoyaning <jiaoyaning@koolearn-inc.com>
Date: Thu, 8 Aug 2019 18:42:41 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=B7=BB=E5=8A=A0onTextChange?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/jyn/vcview/simple/MainActivity.java   |  9 +++-
 simple/src/main/res/layout/activity_main.xml  | 19 +++------
 .../com/jyn/vcview/VerificationCodeView.java  | 41 +++++++++----------
 3 files changed, 32 insertions(+), 37 deletions(-)

diff --git a/simple/src/main/java/com/jyn/vcview/simple/MainActivity.java b/simple/src/main/java/com/jyn/vcview/simple/MainActivity.java
index c85fdeb..ba9fe73 100644
--- a/simple/src/main/java/com/jyn/vcview/simple/MainActivity.java
+++ b/simple/src/main/java/com/jyn/vcview/simple/MainActivity.java
@@ -21,8 +21,13 @@ public class MainActivity extends AppCompatActivity {
         textView = findViewById(R.id.text);
         verificationcodeview.setOnCodeFinishListener(new VerificationCodeView.OnCodeFinishListener() {
             @Override
-            public void onComplete(String content) {
-                textView.setText(content);
+            public void onTextChange(View view, String content) {
+                textView.setText("输入中：" + content);
+            }
+
+            @Override
+            public void onComplete(View view, String content) {
+                textView.setText("输入结束：" + content);
             }
         });
     }
diff --git a/simple/src/main/res/layout/activity_main.xml b/simple/src/main/res/layout/activity_main.xml
index 9265f13..437b46a 100644
--- a/simple/src/main/res/layout/activity_main.xml
+++ b/simple/src/main/res/layout/activity_main.xml
@@ -11,7 +11,7 @@
         android:id="@+id/verificationcodeview"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="30dp"
+        android:layout_marginTop="10dp"
         android:gravity="center"
         android:orientation="horizontal"
         app:vcv_et_bg="@drawable/et_login_code"
@@ -22,26 +22,19 @@
         app:vcv_et_text_color="@android:color/black"
         app:vcv_et_text_size="6sp" />
 
-    <EditText
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:inputType="numberPassword"
-        android:visibility="gone" />
-
     <TextView
         android:id="@+id/text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
+        android:layout_marginStart="20dp"
+        android:layout_marginLeft="20dp"
         android:layout_marginTop="20dp"
-        android:text="验证码"
-        android:textSize="20sp" />
+        android:text="输入开始:" />
 
     <Button
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_marginTop="20dp"
+        android:layout_marginTop="10dp"
         android:onClick="clear"
         android:text="清空输入框" />
 </LinearLayout>
diff --git a/verificationcodeview/src/main/java/com/jyn/vcview/VerificationCodeView.java b/verificationcodeview/src/main/java/com/jyn/vcview/VerificationCodeView.java
index e42728a..3302894 100644
--- a/verificationcodeview/src/main/java/com/jyn/vcview/VerificationCodeView.java
+++ b/verificationcodeview/src/main/java/com/jyn/vcview/VerificationCodeView.java
@@ -27,10 +27,9 @@ import java.lang.reflect.Field;
  * update 2019/8/8
  */
 
-public class VerificationCodeView extends LinearLayout implements TextWatcher, View.OnKeyListener, View.OnFocusChangeListener {
+public class VerificationCodeView extends LinearLayout implements TextWatcher, View.OnKeyListener {
 
     private Context mContext;
-    private long endTime = 0;
     private OnCodeFinishListener onCodeFinishListener;
 
     /**
@@ -251,7 +250,6 @@ public class VerificationCodeView extends LinearLayout implements TextWatcher, V
         editText.setBackgroundResource(mEtTextBg);
         setEditTextCursorDrawable(editText);
         editText.addTextChangedListener(this);
-        editText.setOnFocusChangeListener(this);
         editText.setOnKeyListener(this);
     }
 
@@ -333,6 +331,14 @@ public class VerificationCodeView extends LinearLayout implements TextWatcher, V
         if (s.length() != 0) {
             focus();
         }
+        if (onCodeFinishListener != null) {
+            onCodeFinishListener.onTextChange(this, getResult());
+            //如果最后一个输入框有字符，则返回结果
+            EditText lastEditText = (EditText) getChildAt(mEtNumber - 1);
+            if (lastEditText.getText().length() > 0) {
+                onCodeFinishListener.onComplete(this, getResult());
+            }
+        }
     }
 
     @Override
@@ -376,12 +382,6 @@ public class VerificationCodeView extends LinearLayout implements TextWatcher, V
                 }
             }
         }
-
-        //如果最后一个输入框有字符，则返回结果
-        EditText lastEditText = (EditText) getChildAt(mEtNumber - 1);
-        if (lastEditText.getText().length() > 0) {
-            getResult();
-        }
     }
 
     private void backFocus() {
@@ -402,27 +402,24 @@ public class VerificationCodeView extends LinearLayout implements TextWatcher, V
         }
     }
 
-    private void getResult() {
-        StringBuffer stringBuffer = new StringBuffer();
+    private String getResult() {
+        StringBuilder stringBuffer = new StringBuilder();
         EditText editText;
         for (int i = 0; i < mEtNumber; i++) {
             editText = (EditText) getChildAt(i);
             stringBuffer.append(editText.getText());
         }
-        if (onCodeFinishListener != null) {
-            onCodeFinishListener.onComplete(stringBuffer.toString());
-        }
-    }
-
-    @Override
-    public void onFocusChange(View v, boolean hasFocus) {
-        if (hasFocus) {
-            focus();
-        }
+        return stringBuffer.toString();
     }
 
     public interface OnCodeFinishListener {
-        void onComplete(String content);
+
+        void onTextChange(View view, String content);
+
+        /**
+         * 输入完成
+         */
+        void onComplete(View view, String content);
     }
 
     /**