调整

app/release/output-metadata.json

@@ -10,9 +10,9 @@
     {
       "type": "SINGLE",
       "filters": [],
-      "versionCode": 12,
-      "versionName": "1.1.3",
-      "outputFile": "jz_app_v1.1.3_release_1114.apk"
+      "versionCode": 13,
+      "versionName": "1.1.4",
+      "outputFile": "jz_app_v1.1.4_release_1124.apk"
     }
   ]
 }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/copapply/ObuActivation.java

@@ -65,7 +65,7 @@ public class ObuActivation implements ToastAction {
         bean = new SendTheVerificationCodeBean();
         bean.setObuId(apduBean.getContractNo()); //OBU号
         //获取Obu信息
-        MyRetrofit.newInstance(context,true, IFCode.IFCODE153, bean, new MyRetrofit.ReturnResult() {
+        MyRetrofit.newInstance(context, IFCode.IFCODE153, bean, new MyRetrofit.ReturnResult() {
             @Override
             public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
                 outCallBack.onSuccess((ResultBean.BizContent) bizContent.getData().get(0));

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PetCardToAccountCardStep2Activity.java

@@ -58,6 +58,7 @@ public class PetCardToAccountCardStep2Activity extends AppActivity {
             Bundle bundle = new Bundle();
             bundle.putString("json",json);
             bundle.putString("applyId",applyId);
+            bundle.putString("productId",getIntent().getStringExtra("productId"));
             jumpToPage(PetCardToAccountCardStep3Activity.class,bundle);
             finish();
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PetCardToAccountCardStep3Activity.java

@@ -68,6 +68,7 @@ public class PetCardToAccountCardStep3Activity extends AppActivity {
             Bundle bundle = new Bundle();
             bundle.putString("json",json);
             bundle.putString("applyId",applyId);
+            bundle.putString("productId",getIntent().getStringExtra("productId"));
             jumpToPage(PetCardToAccountCardStep4Activity.class,bundle);
             finish();
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PetCardToAccountCardStep4Activity.java

@@ -75,6 +75,7 @@ public class PetCardToAccountCardStep4Activity extends AppActivity {
         Bundle bundle = new Bundle();
         bundle.putString("json",json);
         bundle.putString("id",id);
+        bundle.putString("productId",getIntent().getStringExtra("productId"));
         jumpToPage(PetCardToAccountCardStep5Activity.class,bundle);
         finish();
     }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PetCardToAccountCardStep5Activity.java

@@ -148,6 +148,7 @@ public class PetCardToAccountCardStep5Activity extends AppActivity {
         params.put("address", FunHelper.getText(binding.etAddr));
         params.put("area", FunHelper.getText(binding.tvArea));
         params.put("postCode", FunHelper.getText(binding.etPostCard));
+        params.put("productId", getIntent().getStringExtra("productId"));
         params.put("agentId", "52010106004");
         params.put("channelId", "5201010200601130001");
         params.put("channelType", "1");

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/after/PetCardToAccountCardStepExtraActivity.java

@@ -4,12 +4,15 @@ import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 
 import android.annotation.SuppressLint;
+import android.content.Intent;
+import android.os.Build;
 import android.os.Bundle;
 import android.text.TextUtils;
 import android.view.Gravity;
 import android.view.View;
 import android.widget.LinearLayout;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.blankj.utilcode.util.ArrayUtils;
@@ -36,6 +39,7 @@ import com.scwang.smart.refresh.layout.api.RefreshLayout;
 import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 
 import java.util.ArrayList;
+import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -89,8 +93,32 @@ public class PetCardToAccountCardStepExtraActivity extends AppActivity implement
                     if (list.size() == 0) {
                         showEmpty();
                     } else {
-                        adapter.replaceData(list.stream().filter(item-> ArrayUtils.contains(item.cardType,"2")).collect(Collectors.toList()));
-                        showComplete();
+                        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
+                            list = list.stream().filter(item-> ArrayUtils.contains(item.cardType,"2")).collect(Collectors.toList());
+                            if (list.size()>0){
+                                adapter.replaceData(list);
+                                showComplete();
+                            }else {
+                                showEmpty();
+                            }
+                        }else {
+                            List<ResultBean.BizContent> list2 = new ArrayList<>();
+                            Iterator iterator = list.iterator();
+                            ResultBean.BizContent bizContent1;
+                            if (iterator.hasNext()){
+                                bizContent1 = (ResultBean.BizContent) iterator.next();
+                                if (ArrayUtils.contains(bizContent1.cardType,"2")){
+                                    list2.add(bizContent1);
+                                }
+                            }
+                            if (list2.size()>0){
+                                adapter.replaceData(list2);
+                                showComplete();
+                            }else {
+                                showEmpty();
+                            }
+                        }
+
                     }
                 }catch (JsonParseException e){
                     toast(e);
@@ -150,22 +178,12 @@ public class PetCardToAccountCardStepExtraActivity extends AppActivity implement
                         toast("无法获取卡类型");
                         return;
                     }
-                    if (items.cardType.length>1){
-                        if (cardTypeList.size()>0){
-                            cardTypeList.clear();
-                        }
-                        for (int i = 0;i<items.cardType.length;i++){
-                            cardTypeList.add(getCardTypeName(items.cardType[i]));
-                        }
-                        new MenuDialog.Builder(mContext)
-                                .setGravity(Gravity.CENTER)
-                                .setList(cardTypeList)
-                                .setListener((MenuDialog.OnListener<String>) (dialog, position, string) -> {
-//                                    gotoNextPage(items,items.cardType[position]);
-                                }) .show();
-                    }else {
-//                        gotoNextPage(items,items.cardType[0]);
-                    }
+                    Intent intent = new Intent();
+                    intent.setClass(PetCardToAccountCardStepExtraActivity.this,PetCardToAccountCardStep2Activity.class);
+                    intent.putExtra("productId",items.promoteId);
+                    intent.putExtra("dataJson",getIntent().getStringExtra("dataJson"));
+                    intent.putExtra("applyId",getIntent().getStringExtra("applyId"));
+                    startActivity(intent);
                 }
             });
         }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/order/OrderUtils.java

@@ -196,8 +196,8 @@ public class OrderUtils {
                     btnAgainActive.setVisibility(View.VISIBLE);
                     break;
                 case Constants.ORDER_STATUS_RETURN_GOODS://退货中
-                    LLBtns.setVisibility(View.VISIBLE);
-                    btnReceiveGoods.setVisibility(View.VISIBLE);
+                    LLBtns.setVisibility(View.GONE);
+                    btnReceiveGoods.setVisibility(View.GONE);
                     break;
                 case Constants.ORDER_STATUS_EX_GOODS://换货中
                     break;

common.gradle

@@ -9,8 +9,8 @@ android {
         // 目标适配版本
         //noinspection ExpiredTargetSdkVersion,OldTargetApi
         targetSdkVersion 30
-        versionName '1.1.3'
-        versionCode 12
+        versionName '1.1.4'
+        versionCode 13
     }
 
     // 支持 Java JDK 8