guilin 1 місяць тому
батько
коміт
843a811354

+ 1 - 1
app/src/main/java/com/fxy/detection/ScanPhotosMainActivity.java

@@ -138,7 +138,7 @@ public class ScanPhotosMainActivity extends  BaseActivity implements StoJNI.Scan
             if (requestCode == PictureConfig.CHOOSE_REQUEST) {// 图片选择结果回调
                 pictureSelectorUpload.getSelectImg(data);
             }
-
+            pictureSelectorUpload.authCamera();
             totalAwaitNum();
         }
     }

+ 6 - 1
app/src/main/java/com/fxy/main/fragment/HomePagerFragment.java

@@ -183,10 +183,11 @@ public class HomePagerFragment extends BaseFragment implements View.OnClickListe
             R.id.ivt_hk_pallet_location,R.id.ivt_hk_pickup,
             R.id.ivt_detection_putaway,R.id.ivt_detection_destroy_outbound,R.id.ivt_detection_make_box,
             R.id.ivt_detection_work,R.id.ivt_scan_photos,R.id.ivt_detection_box_putin,
-            R.id.ivt_detection_tray_putin,R.id.ivt_detection_tray_make})
+            R.id.ivt_detection_tray_putin,R.id.ivt_detection_tray_make, R.id.ivt_detection_plate})
     public void onClick(View v) {
         Bundle bundle = new Bundle();
         switch (v.getId()) {
+
             case R.id.ivt_tally:
 //                bundle.putString("action","receive");
 //                intent2Page(getActivity(), TallyMainActivity.class, false,bundle);;
@@ -265,6 +266,10 @@ public class HomePagerFragment extends BaseFragment implements View.OnClickListe
             case R.id.ivt_detection_make_box:
                 intent2Page(getActivity(), BoxMakeMainActivity.class, false,bundle);
                 break;
+            case R.id.ivt_detection_plate:
+                bundle.putString("action","receive");
+                intent2Page(getActivity(), TallyMainActivity.class, false,bundle);;
+                break;
             default:
                 showToast("还没有配置点击事件");
                 break;

+ 19 - 19
app/src/main/res/layout/fragment_homepager.xml

@@ -92,12 +92,7 @@
                         android:layout_marginTop="@dimen/t12"
                         android:weightSum="2">
 
-                        <!--<TextView
-                            android:id="@+id/ivt_putin_photos"
-                            style="@style/ImageViewWithTextStyle.FontSize"
-                            android:drawableTop="@drawable/ic_putin_photos"
-                            android:drawablePadding="5dp"
-                            android:text="快递入库" />-->
+
                         <TextView
                             android:id="@+id/ivt_tally"
                             style="@style/ImageViewWithTextStyle.FontSize"
@@ -278,13 +273,13 @@
                             android:drawableTop="@drawable/ic_mapan"
                             android:drawablePadding="5dp"
                             android:text="单箱入库" />
-
                         <TextView
-                            style="@style/ImageViewWithTextStyle.FontSize"
-                            android:id="@+id/ivt_detection_tray_putin"
-                            android:drawableTop="@drawable/ic_mapan"
-                            android:drawablePadding="5dp"
-                            android:text="托盘入库" />
+                           android:id="@+id/ivt_detection_plate"
+                           style="@style/ImageViewWithTextStyle.FontSize"
+                           android:drawableTop="@drawable/ic_putin_photos"
+                           android:drawablePadding="5dp"
+                           android:text="打板" />
+
 
                     </TableRow>
 
@@ -294,21 +289,21 @@
                         android:layout_marginTop="@dimen/t12"
                         android:weightSum="2">
 
-
-
                         <TextView
                             style="@style/ImageViewWithTextStyle.FontSize"
-                            android:id="@+id/ivt_detection_tray_make"
+                            android:id="@+id/ivt_detection_tray_putin"
                             android:drawableTop="@drawable/ic_mapan"
                             android:drawablePadding="5dp"
-                            android:text="托盘清点" />
+                            android:text="托盘入库" />
 
                         <TextView
                             style="@style/ImageViewWithTextStyle.FontSize"
-                            android:id="@+id/ivt_scan_photos"
+                            android:id="@+id/ivt_detection_tray_make"
                             android:drawableTop="@drawable/ic_mapan"
                             android:drawablePadding="5dp"
-                            android:text="扫码拍照" />
+                            android:text="托盘清点" />
+
+
 
                     </TableRow>
 
@@ -317,7 +312,12 @@
                         android:layout_height="wrap_content"
                         android:layout_marginTop="@dimen/t12"
                         android:weightSum="2">
-
+                        <TextView
+                            style="@style/ImageViewWithTextStyle.FontSize"
+                            android:id="@+id/ivt_scan_photos"
+                            android:drawableTop="@drawable/ic_mapan"
+                            android:drawablePadding="5dp"
+                            android:text="扫码拍照" />
                         <TextView
                             android:id="@+id/ivt_detection_make_box"
                             style="@style/ImageViewWithTextStyle.FontSize"