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

app/build.gradle

@@ -44,7 +44,8 @@ android {
             minifyEnabled true
             shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            buildConfigField "String", "EMQX_HOST", "\"tcp://183.3.221.143:1883\""
+            buildConfigField "String", "EMQX_HOST", "\"tcp://183.3.221.143:1883\"" // 测试环境
+//            buildConfigField "String", "EMQX_HOST", "\"tcp://192.168.1.244:1883\"" // 开发环境
             buildConfigField "String", "ICSP_HOST", "\"http://icsp-testend.ds-bay.com\""
             //buildConfigField "String", "ICSP_HOST", "\"http://vz2x2s.natappfree.cc\""
             signingConfig signingConfigs.debug

app/src/main/java/com/emato/ich/MainActivity.java

@@ -1,8 +1,13 @@
 package com.emato.ich;
 
 import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.net.Uri;
 import android.os.Bundle;
 
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.engine.DiskCacheStrategy;
 import com.cherry.sdk.controller.utils.ScanGunKeyEventHelper;
 import com.emato.ich.api.ICSPApi;
 import com.emato.ich.api.ICSPClient;
@@ -11,10 +16,13 @@ import com.emato.ich.contant.OpenLockerResponseConstant;
 import com.emato.ich.contant.SystemConfigConstant;
 import com.emato.ich.crash.CrashApplication;
 import com.emato.ich.device.DeviceControl;
+import com.emato.ich.entity.BzCabBizCfg;
 import com.emato.ich.entity.Cabinet;
 import com.emato.ich.entity.Message;
 import com.emato.ich.entity.vo.ResponseData;
 import com.emato.ich.entity.vo.ShellVo;
+import com.emato.ich.enums.TakeButtonShowEnum;
+import com.emato.ich.enums.TakeQrCodeShowEnum;
 import com.emato.ich.local.LocalStorage;
 import com.emato.ich.message.ICHPublishClient;
 import com.emato.ich.message.ICHSubscribeClient;
@@ -60,22 +68,28 @@ import com.xuexiang.xupdate.proxy.impl.DefaultUpdateParser;
 
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.view.WindowManager;
 import android.view.inputmethod.InputMethodManager;
+import android.widget.ImageView;
 import android.widget.Toast;
 
 import org.eclipse.paho.client.mqttv3.MqttMessage;
 import org.jetbrains.annotations.NotNull;
 
+import java.io.ByteArrayOutputStream;
 import java.io.File;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.InputStream;
+import java.net.HttpURLConnection;
+import java.net.URL;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CountDownLatch;
 
@@ -168,6 +182,7 @@ public class MainActivity extends AppCompatActivity  {
     }
 
     private void getSystemConfig(){
+
         ICSPClient.getSystemConfig("", BaseUtils.getClientId(), new Callback() {
             @Override
             public void onFailure(@NotNull Call call, @NotNull IOException e) {
@@ -206,6 +221,22 @@ public class MainActivity extends AppCompatActivity  {
                                 banner.initBanner(cabImgList);
                             }
 
+                            String takeQrCodeShow = configMap.get(SystemConfigConstant.take_qr_code_show);
+                            String takeButtonShow = configMap.get(SystemConfigConstant.take_button_show);
+                            // 取件二维码是否展示
+                            if (TakeQrCodeShowEnum.item_1.getItem().equals(takeQrCodeShow)){
+                                findViewById(R.id.fast_take_send).setVisibility(View.GONE);
+                                findViewById(R.id.fast_take_send_bg).setVisibility(View.GONE);
+                            }else {
+                                findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
+                                findViewById(R.id.fast_take_send_bg).setVisibility(View.VISIBLE);
+                            }
+                            // 取件码取件是否展示
+                            if (TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){
+                                findViewById(R.id.take_btn).setVisibility(View.GONE);
+                            }else {
+                                findViewById(R.id.take_btn).setVisibility(View.VISIBLE);
+                            }
                             Log.i(TAG, "onResponse: =====================>获取系统配置成功! ");
                         } else {
                             Log.w(TAG, "onResponse: code==>" + readValue.getCode() + ", msg==>" + readValue.getMsg());
@@ -213,9 +244,11 @@ public class MainActivity extends AppCompatActivity  {
                     } catch (RuntimeException e) {
                         Log.e(TAG, "onResponse: 获取系统配置错误! 未知错误! ", e);
                     } catch (JsonMappingException e) {
-                        e.printStackTrace();
+                        Log.e(TAG, "onResponse: 获取系统配置错误! 未知错误! ", e);
                     } catch (JsonProcessingException e) {
-                        e.printStackTrace();
+                        Log.e(TAG, "onResponse: 获取系统配置错误! 未知错误! ", e);
+                    }catch (Exception e){
+                        Log.e(TAG, "onResponse: 获取系统配置错误! 未知错误! ", e);
                     }
                 });
             }

app/src/main/java/com/emato/ich/contant/SystemConfigConstant.java

@@ -17,5 +17,15 @@ public class SystemConfigConstant {
 
     // 快递柜轮播图
     public static final String CAB_IMG_LIST = "cabImgList";
+    // 机柜业务配置
+    public static final String BZ_CAB_BIZ_CFG = "bzCabBizCfg";
+    /**
+     * 取件二维码是否展示 0 展示 1：隐藏
+     */
+    public static final String take_qr_code_show = "takeQrCodeShow";
+    /**
+     * 取件码取件是否展示 0 展示 1：隐藏
+     */
+    public static final String take_button_show = "takeButtonShow";
 
 }

app/src/main/java/com/emato/ich/entity/BzCabBizCfg.java

@@ -0,0 +1,324 @@
+package com.emato.ich.entity;
+
+/**
+ * 机柜业务配置对象 bz_cab_biz_cfg
+ * 
+ * @author yangbo
+ * @date 2021-06-11
+ */
+public class BzCabBizCfg
+{
+    private static final long serialVersionUID = 1L;
+
+    /** 机柜业务配置序号 */
+    private Long cabBizCfgId;
+
+    /** 机柜柜组id */
+    private Long cabId;
+
+    /** 机柜柜组编号 */
+    private String cabSn;
+
+    /** 网点序号，唯一 */
+    private Long locationId;
+
+    /** 启用计费，open:开启，close:关闭 */
+    private String enableCharge;
+
+    /** 启用黑名单，open:开启，close:关闭 */
+    private String enableBlacklist;
+
+    /** 启用白名单，open:开启，close:关闭 */
+    private String enableWhitelist;
+
+    /** 白名单作用对象，0:取件人，1:投递人，2:寄件人，3:商户用户 */
+    private String whitelistDirectAt;
+
+    /** 短信超时时间，分钟 */
+    private Long smsTimeOut;
+
+    /** 滞留件设置，open:开启，close:关闭 */
+    private String openRetention;
+
+    /** 滞留件首次提醒件数，滞留件达到多少件首次提醒 */
+    private Long retentionFirstAlert;
+
+    /** 滞留件禁止投递件数，滞留件达到多少件不允许投递 */
+    private Long retentionMaxDisable;
+
+    /** 短信模板 */
+    private String smsTemplate;
+
+    /** 滞留短信模板 */
+    private String retentionSmsTemplate;
+
+    /** 站点id */
+    private String stationId;
+
+    /** 账户id */
+    private String accountId;
+
+    /** 轨迹上报类型 */
+    private String traceReportType;
+
+    /** 备注 */
+    private String remarks;
+
+    /** 是否有效，0:有效，1:无效 */
+    private String isValid;
+
+    /** 创建人编号 */
+    private Long creatorId;
+
+    /** 修改人编号 */
+    private Long moderId;
+
+    /** 修改时间，yyyy-MM-dd HH:mm:ss */
+    private String modTime;
+
+    /** 快递柜默认手机号*/
+    private String defaultPhone;
+
+    /** 快递柜序号（1、2、3或者A、B、C） */
+    private String cabSerialNo;
+
+    /** 模板类型 0：仅序号1：仅取件码2：序号加取件码 */
+    private String templateType;
+    /**
+     * 柜组详细地址
+     */
+    private String address;
+
+    /**
+     * 取件二维码是否展示 0 展示 1：隐藏
+     */
+    private String takeQrCodeShow;
+    /**
+     * 取件码取件是否展示 0 展示 1：隐藏
+     */
+    private String takeButtonShow;
+
+    public Long getCabBizCfgId() {
+        return cabBizCfgId;
+    }
+
+    public void setCabBizCfgId(Long cabBizCfgId) {
+        this.cabBizCfgId = cabBizCfgId;
+    }
+
+    public Long getCabId() {
+        return cabId;
+    }
+
+    public void setCabId(Long cabId) {
+        this.cabId = cabId;
+    }
+
+    public String getCabSn() {
+        return cabSn;
+    }
+
+    public void setCabSn(String cabSn) {
+        this.cabSn = cabSn;
+    }
+
+    public Long getLocationId() {
+        return locationId;
+    }
+
+    public void setLocationId(Long locationId) {
+        this.locationId = locationId;
+    }
+
+    public String getEnableCharge() {
+        return enableCharge;
+    }
+
+    public void setEnableCharge(String enableCharge) {
+        this.enableCharge = enableCharge;
+    }
+
+    public String getEnableBlacklist() {
+        return enableBlacklist;
+    }
+
+    public void setEnableBlacklist(String enableBlacklist) {
+        this.enableBlacklist = enableBlacklist;
+    }
+
+    public String getEnableWhitelist() {
+        return enableWhitelist;
+    }
+
+    public void setEnableWhitelist(String enableWhitelist) {
+        this.enableWhitelist = enableWhitelist;
+    }
+
+    public String getWhitelistDirectAt() {
+        return whitelistDirectAt;
+    }
+
+    public void setWhitelistDirectAt(String whitelistDirectAt) {
+        this.whitelistDirectAt = whitelistDirectAt;
+    }
+
+    public Long getSmsTimeOut() {
+        return smsTimeOut;
+    }
+
+    public void setSmsTimeOut(Long smsTimeOut) {
+        this.smsTimeOut = smsTimeOut;
+    }
+
+    public String getOpenRetention() {
+        return openRetention;
+    }
+
+    public void setOpenRetention(String openRetention) {
+        this.openRetention = openRetention;
+    }
+
+    public Long getRetentionFirstAlert() {
+        return retentionFirstAlert;
+    }
+
+    public void setRetentionFirstAlert(Long retentionFirstAlert) {
+        this.retentionFirstAlert = retentionFirstAlert;
+    }
+
+    public Long getRetentionMaxDisable() {
+        return retentionMaxDisable;
+    }
+
+    public void setRetentionMaxDisable(Long retentionMaxDisable) {
+        this.retentionMaxDisable = retentionMaxDisable;
+    }
+
+    public String getSmsTemplate() {
+        return smsTemplate;
+    }
+
+    public void setSmsTemplate(String smsTemplate) {
+        this.smsTemplate = smsTemplate;
+    }
+
+    public String getRetentionSmsTemplate() {
+        return retentionSmsTemplate;
+    }
+
+    public void setRetentionSmsTemplate(String retentionSmsTemplate) {
+        this.retentionSmsTemplate = retentionSmsTemplate;
+    }
+
+    public String getStationId() {
+        return stationId;
+    }
+
+    public void setStationId(String stationId) {
+        this.stationId = stationId;
+    }
+
+    public String getAccountId() {
+        return accountId;
+    }
+
+    public void setAccountId(String accountId) {
+        this.accountId = accountId;
+    }
+
+    public String getTraceReportType() {
+        return traceReportType;
+    }
+
+    public void setTraceReportType(String traceReportType) {
+        this.traceReportType = traceReportType;
+    }
+
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getIsValid() {
+        return isValid;
+    }
+
+    public void setIsValid(String isValid) {
+        this.isValid = isValid;
+    }
+
+    public Long getCreatorId() {
+        return creatorId;
+    }
+
+    public void setCreatorId(Long creatorId) {
+        this.creatorId = creatorId;
+    }
+
+    public Long getModerId() {
+        return moderId;
+    }
+
+    public void setModerId(Long moderId) {
+        this.moderId = moderId;
+    }
+
+    public String getModTime() {
+        return modTime;
+    }
+
+    public void setModTime(String modTime) {
+        this.modTime = modTime;
+    }
+
+    public String getDefaultPhone() {
+        return defaultPhone;
+    }
+
+    public void setDefaultPhone(String defaultPhone) {
+        this.defaultPhone = defaultPhone;
+    }
+
+    public String getCabSerialNo() {
+        return cabSerialNo;
+    }
+
+    public void setCabSerialNo(String cabSerialNo) {
+        this.cabSerialNo = cabSerialNo;
+    }
+
+    public String getTemplateType() {
+        return templateType;
+    }
+
+    public void setTemplateType(String templateType) {
+        this.templateType = templateType;
+    }
+
+    public String getAddress() {
+        return address;
+    }
+
+    public void setAddress(String address) {
+        this.address = address;
+    }
+
+    public String getTakeQrCodeShow() {
+        return takeQrCodeShow;
+    }
+
+    public void setTakeQrCodeShow(String takeQrCodeShow) {
+        this.takeQrCodeShow = takeQrCodeShow;
+    }
+
+    public String getTakeButtonShow() {
+        return takeButtonShow;
+    }
+
+    public void setTakeButtonShow(String takeButtonShow) {
+        this.takeButtonShow = takeButtonShow;
+    }
+}

app/src/main/java/com/emato/ich/enums/TakeButtonShowEnum.java

@@ -0,0 +1,33 @@
+package com.emato.ich.enums;
+
+/**
+ * 取件码取件是否展示 0 展示 1：隐藏
+ */
+public enum TakeButtonShowEnum {
+    item_0("0", "展示"),
+    item_1("1", "隐藏");
+
+    private String item;
+    private String itemName;
+
+    TakeButtonShowEnum(String item, String itemName) {
+        this.item = item;
+        this.itemName = itemName;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+}

app/src/main/java/com/emato/ich/enums/TakeQrCodeShowEnum.java

@@ -0,0 +1,33 @@
+package com.emato.ich.enums;
+
+/**
+ * 取件二维码是否展示 0 展示 1：隐藏
+ */
+public enum TakeQrCodeShowEnum {
+    item_0("0", "展示"),
+    item_1("1", "隐藏");
+
+    private String item;
+    private String itemName;
+
+    TakeQrCodeShowEnum(String item, String itemName) {
+        this.item = item;
+        this.itemName = itemName;
+    }
+
+    public String getItem() {
+        return item;
+    }
+
+    public void setItem(String item) {
+        this.item = item;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+}

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

@@ -89,7 +89,7 @@ public class ChooseCabinetFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, ChooseCabinetFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, ChooseCabinetFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -49,7 +49,7 @@ public class CourierFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, CourierFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, CourierFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -70,7 +70,7 @@ public class ExceptionFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, ExceptionFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, ExceptionFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -70,7 +70,7 @@ public class ExpressDeliveryFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, ExpressDeliveryFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, ExpressDeliveryFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -4,6 +4,10 @@ import android.os.Bundle;
 
 import com.bumptech.glide.Glide;
 import com.bumptech.glide.load.engine.DiskCacheStrategy;
+import com.emato.ich.entity.BzCabBizCfg;
+import com.emato.ich.enums.TakeButtonShowEnum;
+import com.emato.ich.enums.TakeQrCodeShowEnum;
+import com.emato.ich.utils.JacksonUtils;
 import com.emato.ich.utils.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -24,6 +28,8 @@ import com.emato.ich.utils.StringUtils;
 
 import org.jetbrains.annotations.NotNull;
 
+import java.util.Objects;
+
 /**
  * 主页
  */
@@ -50,7 +56,22 @@ public class MainFragment extends Fragment {
         super.onViewCreated(view, savedInstanceState);
         MainActivity activity = (MainActivity) getActivity();
         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)){
+            view.findViewById(R.id.fast_take_send).setVisibility(View.GONE);
+            view.findViewById(R.id.fast_take_send_bg).setVisibility(View.GONE);
+        }else {
+            view.findViewById(R.id.fast_take_send).setVisibility(View.VISIBLE);
+            view.findViewById(R.id.fast_take_send_bg).setVisibility(View.VISIBLE);
+        }
+        // 取件码取件是否展示
+        if (TakeButtonShowEnum.item_1.getItem().equals(takeButtonShow)){
+            view.findViewById(R.id.take_btn).setVisibility(View.GONE);
+        }else {
+            view.findViewById(R.id.take_btn).setVisibility(View.VISIBLE);
+        }
         if (getActivity() != null && activity.getConfigMap().size() > 0 && !StringUtils.isNullOrEmpty(url)) {
 
             try {
@@ -78,12 +99,12 @@ public class MainFragment extends Fragment {
             NavUtils.navigate(this, R.id.action_mainFragment_to_chooseCabinetFragment);
         });
         // 取件页面跳转 德合隐藏
-//        binding.takeBtn.setOnClickListener(view1 -> {
-//            if (ButtonUtils.isFastClick()) {
-//                return;
-//            }
-//            NavUtils.navigate(this, R.id.action_mainFragment_to_takeFragment);
-//        });
+        binding.takeBtn.setOnClickListener(view1 -> {
+            if (ButtonUtils.isFastClick()) {
+                return;
+            }
+            NavUtils.navigate(this, R.id.action_mainFragment_to_takeFragment);
+        });
         // 派件员页面跳转
         binding.delivererBtn.setOnClickListener(view1 -> {
             if (ButtonUtils.isFastClick()) {

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

@@ -73,7 +73,7 @@ public class SendFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, SendFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, SendFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时异常! ", e);

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

@@ -79,7 +79,7 @@ public class SendKeyBoardFragment extends Fragment {
 
         try {
             MainActivity activity = (MainActivity) getActivity();
-            timer = TimeOutUtils.timeout(activity, SendKeyBoardFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, SendKeyBoardFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时异常! ", e);

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

@@ -71,7 +71,7 @@ public class SendMainFragment extends Fragment {
         }
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, SendMainFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, SendMainFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -50,7 +50,7 @@ public class SendSuccessFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnMainBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, SendSuccessFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, SendSuccessFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -80,7 +80,7 @@ public class TakeCodeFragment extends Fragment {
 
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeCodeFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, TakeCodeFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -64,7 +64,7 @@ public class TakeFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, TakeFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);

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

@@ -2,6 +2,8 @@ package com.emato.ich.fragment;
 
 import android.os.Bundle;
 import android.os.CountDownTimer;
+
+import com.emato.ich.entity.vo.ExpressSendOrderPickUpDto;
 import com.emato.ich.utils.Log;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -71,7 +73,7 @@ public class TakeSuccessFragment extends Fragment {
 //        ColorConstant.setButtonColor(binding.returnMainBtn, ColorConstant.RETURN_BUTTON_BG_COLOR);
         try {
             MainActivity activity = ((MainActivity) getActivity());
-            timer = TimeOutUtils.timeout(activity, TakeSuccessFragment.this, binding.timeout, 60);
+            timer = TimeOutUtils.timeout(activity, TakeSuccessFragment.this, binding.timeout, 120);
             timer.start();
         } catch (Exception e) {
             Log.e(TAG, "onViewCreated: 倒计时出现异常! ", e);
@@ -149,6 +151,10 @@ public class TakeSuccessFragment extends Fragment {
                 activity = (MainActivity) getActivity();
                 Bundle bundle = activity.getBundleMap().get(TakeCodeFragment.class.getName());
                 takeParcelCode = bundle.getString("takeParcelCode");
+                if (StringUtils.isNullOrEmpty(takeParcelCode)){
+                    takeParcelCode = activity.getBundleMap().get(ExpressSendOrderPickUpDto.class.getName()).getString("pickUp");
+                }
+
             } catch (RuntimeException e) {
                 Log.e(TAG, "onViewCreated: 获取TakeCodeFragment传值TakeSuccessFragment失败! ", e);
                 LoggingUtils.sendErrorLog("业务异常: 获取TakeCodeFragment传值TakeSuccessFragment失败! ", e);

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

@@ -26,55 +26,54 @@
 <!--        android:textSize="20sp"-->
 <!--        android:textStyle="bold" />-->
 
+    <!--原位置-->
+    <!--android:layout_y="376dp"-->
+    <!--新位置-->
+    <!--android:layout_y="416dp"-->
+
+    <!--德合的取件按钮隐藏-->
+
+
     <TextView
         android:id="@+id/fast_take_send_bg"
         android:layout_width="120dp"
-        android:layout_height="185dp"
-        android:layout_x="205dp"
-        android:layout_y="376dp"
+        android:layout_height="148dp"
+        android:layout_x="181dp"
+        android:layout_y="440dp"
         android:background="@drawable/textview_border"
         android:gravity="center_horizontal"
         android:paddingTop="15dp"
         android:text="@string/fast_take_or_send"
         android:textSize="13sp" />
 
-    <!--原位置-->
-    <!--android:layout_y="376dp"-->
-    <!--新位置-->
-    <!--android:layout_y="416dp"-->
-
-    <!--德合的取件按钮隐藏-->
-
-
-        <ImageView
+    <ImageView
         android:id="@+id/serialImageView"
         android:layout_width="263dp"
         android:layout_height="60dp"
         android:layout_x="46dp"
-        android:layout_y="309dp"
+        android:layout_y="285dp"
         android:scaleType="fitXY"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
         app:srcCompat="@drawable/img2" />
 
-
-<!--        <TextView
+    <TextView
         android:id="@+id/take_btn"
         android:layout_width="150dp"
         android:layout_height="87dp"
-        android:layout_x="44dp"
-        android:layout_y="511dp"
+        android:layout_x="165dp"
+        android:layout_y="350dp"
         android:background="@drawable/take"
         android:textSize="20sp"
-        android:textStyle="" />-->
+        android:textStyle="" />
 
     <TextView
         android:id="@+id/send_btn"
         android:layout_width="107dp"
         android:layout_height="wrap_content"
         android:layout_x="46dp"
-        android:layout_y="367dp"
+        android:layout_y="350dp"
         android:drawableTop="@drawable/jikuaidi"
         android:gravity="center"
         android:text="@string/express_delivery"
@@ -85,8 +84,8 @@
         android:id="@+id/deliverer_btn"
         android:layout_width="107dp"
         android:layout_height="wrap_content"
-        android:layout_x="46dp"
-        android:layout_y="473dp"
+        android:layout_x="49dp"
+        android:layout_y="460dp"
         android:drawableTop="@drawable/paisongyuan"
         android:gravity="center"
         android:text="@string/delivery"
@@ -97,8 +96,8 @@
         android:id="@+id/fast_take_send"
         android:layout_width="90dp"
         android:layout_height="90dp"
-        android:layout_x="221dp"
-        android:layout_y="442dp"
+        android:layout_x="197dp"
+        android:layout_y="480dp"
         android:background="@drawable/e_mp_qrcode_8x8_backup" />
 
     <!--    android:theme="@style/Theme.ButtonStyle.GREEN"-->