Commit 56d573c3b0565da3c3dcf82cd15f5e32fe40991a

Authored by 杜方
1 parent 939d0202

畅游通标准:修复异常报错

gradle/wrapper/gradle-wrapper.properties
1 -#Fri Apr 28 17:48:08 CST 2017 1 +#Fri Jun 05 14:45:25 CST 2026
2 distributionBase=GRADLE_USER_HOME 2 distributionBase=GRADLE_USER_HOME
  3 +distributionUrl=https\://services.gradle.org/distributions/gradle-6.5-bin.zip
3 distributionPath=wrapper/dists 4 distributionPath=wrapper/dists
4 -zipStoreBase=GRADLE_USER_HOME  
5 zipStorePath=wrapper/dists 5 zipStorePath=wrapper/dists
6 -distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip 6 +zipStoreBase=GRADLE_USER_HOME
local.properties
@@ -4,6 +4,5 @@ @@ -4,6 +4,5 @@
4 # Location of the SDK. This is only used by Gradle. 4 # Location of the SDK. This is only used by Gradle.
5 # For customization when using a Version Control System, please read the 5 # For customization when using a Version Control System, please read the
6 # header note. 6 # header note.
7 -#Mon Feb 26 18:25:25 CST 2024 7 +#Fri Jun 05 14:50:09 CST 2026
8 sdk.dir=D\:\\Android\\sdk 8 sdk.dir=D\:\\Android\\sdk
9 -ndk.dir=D\:\\AndroidTools\\AStudioSDK\\ndk\\21.0.6113669  
src/com/ectrip/cyt/adapter/ReportExpandableListAdapter.java
@@ -372,8 +372,15 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim @@ -372,8 +372,15 @@ public class ReportExpandableListAdapter extends AnimatedExpandableListView.Anim
372 } 372 }
373 373
374 // base.total_num.setText("剩余 " + orderInfos.get(position).getOrderAmount() + " 份"); 374 // base.total_num.setText("剩余 " + orderInfos.get(position).getOrderAmount() + " 份");
375 - LogUtil.d("ReportExpandableListAdapter", "Quantity = " + orderInfos.get(position).getProducts().get(position).getQuantity());  
376 - base.total_num.setText("剩余 " + orderInfos.get(position).getProducts().get(position).getQuantity() + " 份"); 375 + List<ProductInfoQuery> products = orderInfos.get(position).getProducts();
  376 + int totalQuantity = 0;
  377 + if (products != null && !products.isEmpty()) {
  378 + for (ProductInfoQuery product : products) {
  379 + totalQuantity += Integer.parseInt(product.getQuantity());
  380 + }
  381 + }
  382 + LogUtil.d("ReportExpandableListAdapter", "Total Quantity = " + totalQuantity);
  383 + base.total_num.setText("剩余 " + totalQuantity + " 份");
377 384
378 String status = orderInfos.get(position).getOrderStatus(); 385 String status = orderInfos.get(position).getOrderStatus();
379 String paystatus = orderInfos.get(position).getPaymentWay(); 386 String paystatus = orderInfos.get(position).getPaymentWay();