Commit 43f3f676ab4dc5490b048b42f4061e185da54391
1 parent
b8545123
Exists in
master
no message
Showing
3 changed files
with
6 additions
and
5 deletions
Show diff stats
.idea/misc.xml
| @@ -24,7 +24,7 @@ | @@ -24,7 +24,7 @@ | ||
| 24 | </value> | 24 | </value> |
| 25 | </option> | 25 | </option> |
| 26 | </component> | 26 | </component> |
| 27 | - <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK"> | 27 | + <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" project-jdk-name="1.8" project-jdk-type="JavaSDK"> |
| 28 | <output url="file://$PROJECT_DIR$/build/classes" /> | 28 | <output url="file://$PROJECT_DIR$/build/classes" /> |
| 29 | </component> | 29 | </component> |
| 30 | <component name="ProjectType"> | 30 | <component name="ProjectType"> |
app/src/main/java/com/shunzhi/expressscanner/fragment/MainFragment.java
| @@ -136,7 +136,7 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | @@ -136,7 +136,7 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | ||
| 136 | 136 | ||
| 137 | @Override | 137 | @Override |
| 138 | public void afterTextChanged(Editable editable) { | 138 | public void afterTextChanged(Editable editable) { |
| 139 | - if (editable.length() >= 3 && tvCommint.getText().toString().equals("确定录入")) | 139 | + if (editable.length() >= 3 && tvCommint.getText().toString().equals("确定录入")&&editable.length()<11) |
| 140 | mPresenter.SearchExpressPhone(editable.toString()); | 140 | mPresenter.SearchExpressPhone(editable.toString()); |
| 141 | } | 141 | } |
| 142 | }); | 142 | }); |
| @@ -191,7 +191,7 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | @@ -191,7 +191,7 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | ||
| 191 | tvCancle.setVisibility(View.VISIBLE); | 191 | tvCancle.setVisibility(View.VISIBLE); |
| 192 | etExpressCode.setVisibility(View.VISIBLE); | 192 | etExpressCode.setVisibility(View.VISIBLE); |
| 193 | etName.setFocusable(false); | 193 | etName.setFocusable(false); |
| 194 | - etTel.setFocusable(false); | 194 | +// etTel.setFocusable(false); |
| 195 | etExpressCode.setFocusable(false); | 195 | etExpressCode.setFocusable(false); |
| 196 | } | 196 | } |
| 197 | 197 | ||
| @@ -289,10 +289,10 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | @@ -289,10 +289,10 @@ public class MainFragment extends BaseMVPCompatFragment<MainContract.MainPresent | ||
| 289 | layout_tel.setVisibility(View.INVISIBLE); | 289 | layout_tel.setVisibility(View.INVISIBLE); |
| 290 | tvCancle.setVisibility(View.GONE); | 290 | tvCancle.setVisibility(View.GONE); |
| 291 | etExpressCode.setFocusable(true); | 291 | etExpressCode.setFocusable(true); |
| 292 | - etName.setFocusable(true); | 292 | +// etName.setFocusable(true); |
| 293 | etTel.setFocusable(true); | 293 | etTel.setFocusable(true); |
| 294 | etExpressCode.setFocusableInTouchMode(true); | 294 | etExpressCode.setFocusableInTouchMode(true); |
| 295 | - etName.setFocusableInTouchMode(true); | 295 | +// etName.setFocusableInTouchMode(true); |
| 296 | etTel.setFocusableInTouchMode(true); | 296 | etTel.setFocusableInTouchMode(true); |
| 297 | tvCommint.setText("确定并扫描快递"); | 297 | tvCommint.setText("确定并扫描快递"); |
| 298 | etExpressCode.setText(""); | 298 | etExpressCode.setText(""); |
app/src/main/res/layout/fragment_main.xml
| @@ -134,6 +134,7 @@ | @@ -134,6 +134,7 @@ | ||
| 134 | android:layout_weight="5" | 134 | android:layout_weight="5" |
| 135 | android:paddingLeft="@dimen/dp_5" | 135 | android:paddingLeft="@dimen/dp_5" |
| 136 | android:background="@drawable/shape_edit" | 136 | android:background="@drawable/shape_edit" |
| 137 | + android:focusable="false" | ||
| 137 | android:hint="无需输入，根据号码显示姓名" | 138 | android:hint="无需输入，根据号码显示姓名" |
| 138 | android:maxLines="1" | 139 | android:maxLines="1" |
| 139 | android:singleLine="true" | 140 | android:singleLine="true" |