Skip to content

Commit cdf35d3

Browse files
committed
修正 onEditorAction 方法中 KeyEvent 类型参数在某些系统可能返回为空的问题
1 parent 42fe859 commit cdf35d3

6 files changed

Lines changed: 9 additions & 6 deletions

File tree

‎app/src/main/java/com/hjq/demo/ui/activity/account/LoginActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -357,7 +357,7 @@ public void onSoftKeyboardClosed() {
357357
* {@link TextView.OnEditorActionListener}
358358
*/
359359
@Override
360-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
360+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
361361
if (actionId == EditorInfo.IME_ACTION_DONE && mCommitView.isEnabled()) {
362362
// 模拟点击登录按钮
363363
onClick(mCommitView);

‎app/src/main/java/com/hjq/demo/ui/activity/account/PasswordForgetActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import android.widget.EditText;
99
import android.widget.TextView;
1010
import androidx.annotation.NonNull;
11+
import androidx.annotation.Nullable;
1112
import com.hjq.core.manager.InputTextManager;
1213
import com.hjq.custom.widget.view.CountdownView;
1314
import com.hjq.demo.R;
@@ -132,7 +133,7 @@ public void onHttpSuccess(@NonNull HttpData<?> data) {
132133
* {@link TextView.OnEditorActionListener}
133134
*/
134135
@Override
135-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
136+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
136137
if (actionId == EditorInfo.IME_ACTION_DONE && mCommitView.isEnabled()) {
137138
// 模拟点击下一步按钮
138139
onClick(mCommitView);

‎app/src/main/java/com/hjq/demo/ui/activity/account/PasswordResetActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.widget.EditText;
1212
import android.widget.TextView;
1313
import androidx.annotation.NonNull;
14+
import androidx.annotation.Nullable;
1415
import com.hjq.core.manager.InputTextManager;
1516
import com.hjq.demo.R;
1617
import com.hjq.demo.aop.Log;
@@ -132,7 +133,7 @@ public void onHttpSuccess(@NonNull HttpData<?> data) {
132133
* {@link TextView.OnEditorActionListener}
133134
*/
134135
@Override
135-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
136+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
136137
if (actionId == EditorInfo.IME_ACTION_DONE && mCommitView.isEnabled()) {
137138
// 模拟点击提交按钮
138139
onClick(mCommitView);

‎app/src/main/java/com/hjq/demo/ui/activity/account/PhoneResetActivity.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
import android.widget.EditText;
1212
import android.widget.TextView;
1313
import androidx.annotation.NonNull;
14+
import androidx.annotation.Nullable;
1415
import com.hjq.core.manager.InputTextManager;
1516
import com.hjq.custom.widget.view.CountdownView;
1617
import com.hjq.demo.R;
@@ -161,7 +162,7 @@ public void onHttpSuccess(@NonNull HttpData<?> data) {
161162
* {@link TextView.OnEditorActionListener}
162163
*/
163164
@Override
164-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
165+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
165166
if (actionId == EditorInfo.IME_ACTION_DONE && mCommitView.isEnabled()) {
166167
// 模拟点击提交按钮
167168
onClick(mCommitView);

‎app/src/main/java/com/hjq/demo/ui/activity/account/RegisterActivity.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ protected ImmersionBar createStatusBarConfig() {
240240
* {@link TextView.OnEditorActionListener}
241241
*/
242242
@Override
243-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
243+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
244244
if (actionId == EditorInfo.IME_ACTION_DONE && mCommitView.isEnabled()) {
245245
// 模拟点击注册按钮
246246
onClick(mCommitView);

‎app/src/main/java/com/hjq/demo/ui/dialog/common/InputDialog.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ public void onClick(@NonNull View view) {
111111
* {@link TextView.OnEditorActionListener}
112112
*/
113113
@Override
114-
public boolean onEditorAction(@NonNull TextView v, int actionId, @NonNull KeyEvent event) {
114+
public boolean onEditorAction(@NonNull TextView v, int actionId, @Nullable KeyEvent event) {
115115
if (actionId == EditorInfo.IME_ACTION_DONE) {
116116
// 模拟点击确认按钮
117117
onClick(findViewById(R.id.tv_ui_confirm));

0 commit comments

Comments
 (0)