'2023年3月13日22:23:24'

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java

@@ -40,11 +40,11 @@ import retrofit2.converter.scalars.ScalarsConverterFactory;
 public class MyRetrofit {
     //是否设置缓存
     private static final boolean Cache = false;
-<<<<<<< HEAD
+    /**
+     * 修改文件上传地址：VPN访问：192.168.101.145:6001、办公网络访问：222.85.144.89:19003
+     * 回显地址：222.85.144.89:19002/xxxxxx
+     */
 //        private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
-=======
-//    private final String BaseUrl = "http://192.168.100.63:8087/ifzt/api/";
->>>>>>> 270a8d334577076ac9f5bc273e420df71207d9a8
 //    private final String BaseUrl = "http://58.16.58.161:19002/ifzt/api/";
     private final String BaseUrl = "http://222.85.144.89:19002/ifzt/api/";
     private final String appId = "admin001";

app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java

@@ -204,6 +204,16 @@ public class ResultBean<T> {
     public static class BizContent<T> {
         public ProductInfo product; //产品额外信息
         public String productId; //产品ID
+        public String ossFilePath; //产品ID
+
+        public String getOssFilePath() {
+            return ossFilePath;
+        }
+
+        public void setOssFilePath(String ossFilePath) {
+            this.ossFilePath = ossFilePath;
+        }
+
         private String appId = "52030131";
         private boolean init;
         private List<Products> products;

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

@@ -334,15 +334,17 @@ public class IdentityInformationUploadActivity extends AppActivity {
 
                 showDialog("图片文件上传中...");
                 RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE17, new Gson().toJson(fatherBean.bizContent));
-                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
+                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>(true) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                        ResultBean.ProductInfo decVehInfo =
+                                Gson().fromJson(String.valueOf(resultBean.getBizContent()), ResultBean.ProductInfo.class);
                         hideDialog();
                         GlideApp.with(getActivity())
                                 .load(data.get(0))
                                 .into((ImageView) view);
-                        if (!TextUtils.isEmpty(bizContent1.getUrl())) {
-                            imgUrl5 = bizContent1.getUrl();
+                        if (!TextUtils.isEmpty(decVehInfo.data.getUrl())) {
+                            imgUrl5 = decVehInfo.data.getUrl();
                         }
                     }
 

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

@@ -114,10 +114,10 @@ public class VehicleInformationActivity extends AppActivity {
                     }
                 }
 
-                if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
-                    toast("输入的车牌与上传的行驶证车牌不一致，请重新输入或者上传！");
-                    return;
-                }
+//                if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
+//                    toast("输入的车牌与上传的行驶证车牌不一致，请重新输入或者上传！");
+//                    return;
+//                }
 
                 /*if(!binding.text1.getText().toString().equals(getIntent().getStringExtra("vehiclePlate"))){
                     toast("申办车牌与识别出来的车牌不一致，请重新上传申办车牌的行驶证！");
@@ -377,15 +377,20 @@ public class VehicleInformationActivity extends AppActivity {
                 destroy();
                 showDialog("图片文件上传中...");
                 RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE17, new Gson().toJson(fatherBean.bizContent));
-                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
+                new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>(true) {
                     @Override
                     protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
+                        ResultBean.ProductInfo decVehInfo =
+                                Gson().fromJson(String.valueOf(resultBean.getBizContent()), ResultBean.ProductInfo.class);
                         hideDialog();
+//                        GlideApp.wi                                                                                                                                                                                                                                                                                                                                                                                        bbth(getActivity())
+//                                .load("http://222.85.144.89:19003/default-bucket/" + decVehInfo.data.getOssFilePath())
+//                                .into((ImageView) view);
                         GlideApp.with(getActivity())
                                 .load(data.get(0))
                                 .into((ImageView) view);
-                        if (!TextUtils.isEmpty(bizContent1.getUrl())) {
-                            imgUrl3 = bizContent1.getUrl();
+                        if (!TextUtils.isEmpty(decVehInfo.data.getUrl())) {
+                            imgUrl3 = decVehInfo.data.getUrl();
                         }
                     }
 

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

@@ -408,10 +408,10 @@ public class TopEntrapmentActivity extends AppActivity implements INRechargeChoo
                     toast("请输入充值金额，或者选择需要充值的金额！");
                     return;
                 }
-                if(Double.parseDouble(FunHelper.getText(binding.etInputMoney)) < 10){
-                    toast("最低充值金额不小于10元!");
-                    return;
-                }
+//                if(Double.parseDouble(FunHelper.getText(binding.etInputMoney)) < 10){
+//                    toast("最低充值金额不小于10元!");
+//                    return;
+//                }
                 moneyInfo = new RechargeBean(FunHelper.getText(binding.etInputMoney));
                 doRecharge();
             }

app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/mail/ListDeliveryActivity.java

@@ -29,6 +29,7 @@ import com.scwang.smart.refresh.layout.listener.OnRefreshLoadMoreListener;
 import java.util.List;
 
 import androidx.annotation.NonNull;
+
 import retrofit2.Response;
 
 /**
@@ -129,13 +130,19 @@ public class ListDeliveryActivity extends AppActivity implements OnRefreshLoadMo
 
     @Override
     public void onLoadMore(@NonNull RefreshLayout refreshLayout) {
-        Page++;
-        initData();
+        postDelayed(() -> {
+            Page++;
+            initData();
+            binding.rlStatusRefresh.finishLoadMore();
+        }, 500);
     }
 
     @Override
     public void onRefresh(@NonNull RefreshLayout refreshLayout) {
-        Page = 1;
-        initData();
+        postDelayed(() -> {
+            Page = 1;
+            initData();
+            binding.rlStatusRefresh.finishRefresh();
+        }, 500);
     }
 }