删除文本框扫码点击

app/src/main/java/com/fxy/main/fragment/HomePagerFragment.java

@@ -59,11 +59,8 @@ public class HomePagerFragment extends BaseFragment implements View.OnClickListe
      */
     @BindView(R.id.search_view)
     LinearLayout searchView;
-    /**
-     * 二维码按钮
-     */
-    @BindView(R.id.ima_or_code)
-    ImageView imaORCOde;
+
+
 
     Unbinder bind;
     public static final String TYPE = "type";
@@ -130,7 +127,7 @@ public class HomePagerFragment extends BaseFragment implements View.OnClickListe
      * 绑定事件
      * @param v
      */
-    @OnClick({R.id.search_view, R.id.ima_or_code,R.id.ivt_tally,R.id.ivt_cargo_storage,R.id.ivt_tray,
+    @OnClick({R.id.search_view, R.id.ivt_tally,R.id.ivt_cargo_storage,R.id.ivt_tray,
             R.id.ivt_quality,R.id.ivt_order_tool,R.id.ivt_sortation,R.id.ivt_check,
             R.id.ivt_handle_work_order,R.id.ivt_add_work_order})
     public void onClick(View v) {

app/src/main/java/com/fxy/putIn/CheckGoodsMainActivity.java

@@ -564,22 +564,6 @@ public class CheckGoodsMainActivity extends  BaseActivity implements StoJNI.Scan
 
     }
 
-    @OnClick({R.id.ima_or_code})
-    public void onViewClicked(View view) {
-        Bundle bundle = new Bundle();
-        switch (view.getId()) {
-            case R.id.ima_or_code:
-                if(etOrderNo.isEnabled()){
-                    etOrderNo.requestFocus();
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-                break;
-            default:
-                break;
-        }
-    }
-
     @Override
     protected void onDestroy() {
         unbinder.unbind();

app/src/main/java/com/fxy/putIn/SortationMainActivity.java

@@ -648,22 +648,7 @@ public class SortationMainActivity extends  BaseActivity implements StoJNI.ScanC
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
+
 
 
             //监听按确定

app/src/main/java/com/fxy/putIn/TallyMainActivity.java

@@ -939,23 +939,6 @@ public class TallyMainActivity extends  BaseActivity implements StoJNI.ScanCallB
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
-
 
             //监听按确定
             editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/fxy/putIn/TrayMainActivity.java

@@ -686,26 +686,6 @@ public class TrayMainActivity extends  BaseActivity implements StoJNI.ScanCallBa
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            if (imageView!=null){
-                imageView.setOnClickListener(new View.OnClickListener() {
-                    @Override
-                    public void onClick(View v) {
-                        LinearLayout linearLayout = (LinearLayout)v.getParent();
-                        for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                            if( linearLayout.getChildAt(i) instanceof EditText ){
-                                ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                                break;
-                            }
-                        }
-                        ActivityScanerCode.setScanerListener(mScanerListener);
-                        ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                    }
-                });
-            }
-
-
 
             //监听按确定
             editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/fxy/putOut/DeliveryGoodsMainActivity.java

@@ -840,23 +840,6 @@ public class DeliveryGoodsMainActivity extends  BaseActivity implements StoJNI.S
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
-
 
             //监听按确定
             editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/fxy/putOut/QualityInspectionMainActivity.java

@@ -667,22 +667,6 @@ public class QualityInspectionMainActivity extends  BaseActivity implements StoJ
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
 
 
             //监听按确定

app/src/main/java/com/fxy/putOut/QualityVolumeMainActivity.java

@@ -667,23 +667,6 @@ public class QualityVolumeMainActivity extends  BaseActivity implements StoJNI.S
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
-
 
             //监听按确定
             editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/fxy/tool/OrderToolMainActivity.java

@@ -946,23 +946,6 @@ public class OrderToolMainActivity extends  BaseActivity implements StoJNI.ScanC
             LinearLayout linearLayout = (LinearLayout)editText.getParent();
             ImageButton imageButton = getChildImageButton(linearLayout);
 
-            //监听扫描
-            ImageView imageView = linearLayout.findViewById(R.id.ima_or_code);
-            imageView.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    LinearLayout linearLayout = (LinearLayout)v.getParent();
-                    for( int i = 0; i < linearLayout.getChildCount(); i++ ){
-                        if( linearLayout.getChildAt(i) instanceof EditText ){
-                            ((EditText)linearLayout.getChildAt(i)).requestFocus();
-                            break;
-                        }
-                    }
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-            });
-
 
             //监听按确定
             editText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

app/src/main/java/com/fxy/workOrder/StartWorkOrderMainActivity.java

@@ -478,17 +478,10 @@ public class StartWorkOrderMainActivity extends  BaseActivity implements StoJNI.
         llNextAction.setVisibility(View.GONE);
     }
 
-    @OnClick({R.id.ima_or_code,R.id.btn_confirm})
+    @OnClick({R.id.btn_confirm})
     public void onViewClicked(View view) {
         Bundle bundle = new Bundle();
         switch (view.getId()) {
-            case R.id.ima_or_code:
-                if(etOrderNo.isEnabled()){
-                    etOrderNo.requestFocus();
-                    ActivityScanerCode.setScanerListener(mScanerListener);
-                    ActivityScanerCode.intent2Activity(mContext, BaseConfig.COMMON_SCANNER_ONLY);
-                }
-                break;
             case R.id.btn_confirm:
 
                 if (is_finish==1){

app/src/main/res/layout/activity_close_tray.xml

@@ -33,7 +33,7 @@
             android:src="@drawable/ic_clear"
             android:visibility="invisible"
             android:textSize="@dimen/sp_14" />
-        <include layout="@layout/item_image_code" />
+
     </LinearLayout>
 
 

app/src/main/res/layout/activity_complete_shift.xml

@@ -33,7 +33,7 @@
             android:src="@drawable/ic_clear"
             android:visibility="invisible"
             android:textSize="@dimen/sp_14" />
-        <include layout="@layout/item_image_code" />
+
     </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_check_goods.xml

@@ -17,7 +17,7 @@
         <ImageButton
             style="@style/ClearImg"
             android:id="@+id/ib_order_no_clear"/>
-        <include layout="@layout/item_image_code" />
+
     </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_delivery_goods.xml

@@ -36,7 +36,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
             <View
                 android:layout_width="match_parent"
@@ -58,7 +58,7 @@
                     android:id="@+id/ib_container_code_clear"
                     style="@style/ClearImg" />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_order_tool.xml

@@ -123,7 +123,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_quality_inspection.xml

@@ -43,7 +43,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
             <LinearLayout
                 android:layout_width="match_parent"

app/src/main/res/layout/activity_fxy_quality_volume.xml

@@ -66,7 +66,7 @@
                     style="@style/ClearImg"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
             <View
@@ -179,7 +179,7 @@
                     style="@style/ClearImg"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_sortation.xml

@@ -37,7 +37,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
             <View

app/src/main/res/layout/activity_fxy_tally.xml

@@ -37,7 +37,7 @@
                     style="@style/ClearImg"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
             <View
@@ -59,7 +59,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
 

app/src/main/res/layout/activity_fxy_tray.xml

@@ -36,7 +36,7 @@
                     android:id="@+id/ib_order_no_clear"
                     />
 
-                <include   layout="@layout/item_image_code" />
+
             </LinearLayout>
 
             <View

app/src/main/res/layout/activity_fxy_work_order_start.xml

@@ -17,7 +17,7 @@
         <ImageButton
             style="@style/ClearImg"
             android:id="@+id/ib_order_no_clear"/>
-        <include layout="@layout/item_image_code" />
+
     </LinearLayout>
 
 

config.gradle

@@ -8,7 +8,7 @@ ext {
             minSdkVersion    : 17,
             targetSdkVersion : 23,
             versionCode      : 1,
-            versionName      : "2.5.0",
+            versionName      : "2.5.1",
             versionApi       : "2.5",
     ]