Merge branch 'master' of lhm/ich-android into master

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

@@ -20,6 +20,7 @@ import com.emato.ich.api.ICSPClient;
 import com.emato.ich.api.ICSPResponseCodeEnum;
 import com.emato.ich.api.SystemConfigConstant;
 import com.emato.ich.databinding.FragmentTakeCodeBinding;
+import com.emato.ich.entity.vo.PreparedOrderResponseVo;
 import com.emato.ich.entity.vo.ResponseData;
 import com.emato.ich.entity.vo.TakeParcelVo;
 import com.emato.ich.utils.BaseUtils;
@@ -163,9 +164,9 @@ public class TakeCodeFragment extends Fragment {
                             String parseResponse = ICSPClient.isSuccessfulAndParseResponse(response);
                             try {
                                 ObjectMapper objectMapper = new ObjectMapper();
-                                ResponseData responseData = null;
+                                ResponseData<PreparedOrderResponseVo> responseData = null;
                                 try {
-                                    responseData = objectMapper.readValue(parseResponse, new TypeReference<ResponseData>() {
+                                    responseData = objectMapper.readValue(parseResponse, new TypeReference<ResponseData<PreparedOrderResponseVo>>() {
                                     });
                                     ICSPResponseCodeEnum.responseHint(view1, responseData);
                                 } catch (JsonProcessingException e) {
@@ -180,6 +181,7 @@ public class TakeCodeFragment extends Fragment {
                                     Snackbar.make(view1, "取件成功！", Snackbar.LENGTH_LONG).show();
                                     Bundle bundle = new Bundle();
                                     bundle.putString("takeParcelCode", takeParcelCode);
+                                    bundle.putString("takeCabinetNo", responseData.getData().getLockerName());
                                     ((MainActivity) getActivity()).getBundleMap().put(TakeCodeFragment.class.getName(), bundle);
                                     NavHostFragment.findNavController(TakeCodeFragment.this).navigate(R.id.action_takeCodeFragment_to_takeSuccessFragment);
                                 }

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

@@ -18,6 +18,8 @@ import com.emato.ich.api.ICSPClient;
 import com.emato.ich.api.ICSPResponseCodeEnum;
 import com.emato.ich.api.SystemConfigConstant;
 import com.emato.ich.databinding.FragmentTakeSuccessBinding;
+import com.emato.ich.entity.vo.PreparedOrderResponseVo;
+import com.emato.ich.entity.vo.PreparedOrderVo;
 import com.emato.ich.entity.vo.ResponseData;
 import com.emato.ich.entity.vo.TakeParcelVo;
 import com.emato.ich.local.LocalStorage;
@@ -62,6 +64,8 @@ public class TakeSuccessFragment extends Fragment {
         try {
             MainActivity activity = (MainActivity) getActivity();
             String s = activity.getConfigMap().get(SystemConfigConstant.cabinet_take_object_reopen_time);
+            Bundle bundle = activity.getBundleMap().get(TakeCodeFragment.class.getName());
+            binding.openCabinetHintNo.setText(bundle.getString("takeCabinetNo"));
             // 倒计时
             int i = Integer.parseInt(s);
             CountDownTimer timer = new CountDownTimer(i * 1000, 1000) {
@@ -115,9 +119,9 @@ public class TakeSuccessFragment extends Fragment {
                         String parseResponse = ICSPClient.isSuccessfulAndParseResponse(response);
                         try {
                             ObjectMapper objectMapper = new ObjectMapper();
-                            ResponseData responseData = null;
+                            ResponseData<PreparedOrderResponseVo> responseData = null;
                             try {
-                                responseData = objectMapper.readValue(parseResponse, new TypeReference<ResponseData>() {
+                                responseData = objectMapper.readValue(parseResponse, new TypeReference<ResponseData<PreparedOrderResponseVo>>() {
                                 });
                                 ICSPResponseCodeEnum.responseHint(view1, responseData);
                             } catch (JsonProcessingException e) {
@@ -130,6 +134,8 @@ public class TakeSuccessFragment extends Fragment {
                                 // 开门
                                 Log.i(TAG, "onResponse: 取件成功! ");
                                 Snackbar.make(view1, "取件成功！", Snackbar.LENGTH_LONG).show();
+                                PreparedOrderResponseVo data = responseData.getData();
+                                binding.openCabinetHintNo.setText(data.getLockerName());
                                 finalActivity.getBundleMap().remove(TakeCodeFragment.class.getName());
                             } else {
                                 ICSPResponseCodeEnum.responseHint(view1, responseData);