Merge branch 'cabinet_req_2023_05_04' of zyh/ich-android into cabinet_req_2023_05_04

app/src/main/java/com/emato/ich/fragment/MainFragment.java

@@ -79,18 +79,26 @@ public class MainFragment extends Fragment {
         String url = activity.getConfigMap().get(SystemConfigConstant.cabinet_take_object_qrcode_url);
         String takeQrCodeShow = activity.getConfigMap().get(SystemConfigConstant.take_qr_code_show);
         String takeButtonShow = activity.getConfigMap().get(SystemConfigConstant.take_button_show);
-        // 取件二维码是否展示
-        if (TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow)){
+
+        // 取件二维码不展示  取件码取件展示
+        if (TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow) && !TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){
             view.findViewById(R.id.fast_take_send).setVisibility(View.GONE);
             view.findViewById(R.id.fast_take_send_background).setVisibility(View.GONE);
-        }else {
+            view.findViewById(R.id.take_btn).setVisibility(View.VISIBLE);
+
+            view.findViewById(R.id.take_btn).setTranslationX(-53);
+            view.findViewById(R.id.send_btn).setTranslationX(-53);
+            view.findViewById(R.id.deliverer_btn).setTranslationX(-53);
+        }else if (!TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow) && TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){
+            // 取件二维码展示  取件码取件不展示
             view.findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
             view.findViewById(R.id.fast_take_send_background).setVisibility(View.VISIBLE);
-        }
-        // 取件码取件是否展示
-        if (TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){
             view.findViewById(R.id.take_btn).setVisibility(View.GONE);
+            view.findViewById(R.id.send_btn).setTranslationY(50);
         }else {
+            // 取件二维码展示  取件码取件展示
+            view.findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
+            view.findViewById(R.id.fast_take_send_background).setVisibility(View.VISIBLE);
             view.findViewById(R.id.take_btn).setVisibility(View.VISIBLE);
         }
         if (getActivity() != null && activity.getConfigMap().size() > 0 && !StringUtils.isNullOrEmpty(url)) {