2 次代碼提交 88181ea1ce ... 406709a24e

作者 SHA1 備註 提交日期
  wcq 406709a24e Merge branch 'cabinet_req_2023_05_04' of http://git.ds-bay.com/project/ich-android into cabinet_req_2023_05_04 1 年之前
  wcq e7743b26b7 快递柜美化提交布局改造和bug修复 1 年之前

+ 3 - 0
app/src/main/java/com/emato/ich/fragment/ChooseCabinetFragment.java

@@ -103,6 +103,9 @@ public class ChooseCabinetFragment extends Fragment {
         // 判断是否是直接投递的  how_to_send  如果不是直接投递跳转过来的  那就隐藏投递流程
         if (!"expressDelivery".equals(pageType)){
             view.findViewById(R.id.how_to_send).setVisibility(View.GONE);
+            ViewGroup.LayoutParams layoutParams = view.findViewById(R.id.background_layout).getLayoutParams();
+            layoutParams.height = 1500;
+            view.findViewById(R.id.background_layout).setLayoutParams(layoutParams);
         }else{
             view.findViewById(R.id.how_to_send).setVisibility(View.VISIBLE);
         }

+ 1 - 1
app/src/main/java/com/emato/ich/fragment/CollectMaterialsFragment.java

@@ -92,7 +92,7 @@ public class CollectMaterialsFragment extends Fragment {
         String sectionType = null;
         try {
             MainActivity activity = (MainActivity) getActivity();
-            binding.mailNo.setInputType(InputType.TYPE_NULL);   
+//            binding.mailNo.setInputType(InputType.TYPE_NULL);
             // 扫描枪监听 扫描运单号
             activity.scanGunKeyEventHelper = new ScanGunKeyEventHelper(s -> {
                 // 扫码成功回调

+ 1 - 1
app/src/main/java/com/emato/ich/fragment/InputInfoKeyBoardFragment.java

@@ -96,7 +96,7 @@ public class InputInfoKeyBoardFragment extends Fragment {
         try {
             arguments = activity.getBundleMap().get(ChooseCabinetFragment.class.getName());
             sectionType = arguments.getString("section_type");
-            binding.mailNo.setInputType(InputType.TYPE_NULL);   
+//            binding.mailNo.setInputType(InputType.TYPE_NULL);
             // 扫描枪监听 扫描运单号
             activity.scanGunKeyEventHelper = new ScanGunKeyEventHelper(s -> {
                 // 扫码成功回调

+ 1 - 1
app/src/main/java/com/emato/ich/fragment/PaymentFragment.java

@@ -94,7 +94,7 @@ public class PaymentFragment extends Fragment {
         String sectionType = null;
         try {
             MainActivity activity = (MainActivity) getActivity();
-            binding.paymentNo.setInputType(InputType.TYPE_NULL);
+//            binding.paymentNo.setInputType(InputType.TYPE_NULL);
             // 扫描枪监听 扫描付款码
             activity.scanGunKeyEventHelper = new ScanGunKeyEventHelper(s -> {
                 // 扫码成功回调

+ 1 - 0
app/src/main/res/layout/fragment_choose_cabinet.xml

@@ -14,6 +14,7 @@
 
     </AbsoluteLayout>
     <AbsoluteLayout
+        android:id="@+id/background_layout"
         android:layout_width="328dp"
         android:layout_height="420dp"
         android:layout_x="8dp"