分时价格显示修改

app/src/main/java/com/electric/chargingpile/activity/SearchActivity.java

@@ -66,6 +66,7 @@ import com.zhy.http.okhttp.callback.StringCallback;
import java.net.URISyntaxException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Calendar;
import java.util.HashMap;
import java.util.List;
@@ -85,8 +86,8 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
    private List<HistoryInfo> historyInfoList = new ArrayList<HistoryInfo>();
    private HistoryInfo history;
    private List<RecommendZhan> pointList = new ArrayList<>();
    public static List<RecommendZhan> pointAllList = new ArrayList<>();
    private List<RecommendZhan> pointList = new ArrayList<RecommendZhan>();
    public static List<RecommendZhan> pointAllList = new ArrayList<RecommendZhan>();
    private Map<String, String> map;
@@ -779,8 +780,8 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                            double service_free = 0;
                            double charge_free = 0;
                            try {
                                service_free = Double.valueOf(bean.getService_free());
                                charge_free = Double.valueOf(bean.getCharge_free());
                                service_free = Double.valueOf(bean.getServicefee());
                                charge_free = Double.valueOf(bean.getDianfee());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }
@@ -971,9 +972,32 @@ public class SearchActivity extends Activity implements OnClickListener, Inputti
                                double d = AMapUtils.calculateLineDistance(center, ll);
                                point.setDistance(Util.getDistance(d));
                                point.setDistanceDouble(d);
                                pointAllList.add(point);
                            }
                            int size = pointAllList.size();
                            if (size > 0) {
                                RecommendZhan[] tempList = new RecommendZhan[size];
                                for (int i=0;i<size;i++) {
                                    tempList[i] = pointAllList.get(i);
                                }
                                Arrays.sort(tempList, (b1, b2) -> {
                                    if (b1.getDistanceDouble() > b2.getDistanceDouble()) {
                                        return 1;
                                    } else if (b1.getDistanceDouble() < b2.getDistanceDouble()) {
                                        return -1;
                                    } else {
                                        return 0;
                                    }
                                });
                                pointAllList.clear();
                                for (RecommendZhan zhan: tempList) {
                                    pointAllList.add(zhan);
                                }
                            }
                            for (RecommendZhan point : pointAllList) {
                                pointList.add(point);
                                if (pointList.size() >= 5) {

app/src/main/java/com/electric/chargingpile/activity/SearchAllActivity.java

@@ -330,8 +330,8 @@ public class SearchAllActivity extends AppCompatActivity {
                            double service_free = 0;
                            double charge_free = 0;
                            try {
                                service_free = Double.valueOf(bean.getService_free());
                                charge_free = Double.valueOf(bean.getCharge_free());
                                service_free = Double.valueOf(bean.getServicefee());
                                charge_free = Double.valueOf(bean.getDianfee());
                            } catch (Exception e) {
                                e.printStackTrace();
                            }

app/src/main/java/com/electric/chargingpile/data/PileData.java

@@ -237,6 +237,24 @@ public class PileData implements Serializable {
        private String end;
        private String service_free;
        private String charge_free;
        private String dianfee;
        private String servicefee;
        public String getDianfee() {
            return dianfee;
        }
        public void setDianfee(String dianfee) {
            this.dianfee = dianfee;
        }
        public String getServicefee() {
            return servicefee;
        }
        public void setServicefee(String servicefee) {
            this.servicefee = servicefee;
        }
        public String getStart() {
            return start;

app/src/main/java/com/electric/chargingpile/data/RecommendZhan.java

@@ -41,6 +41,7 @@ public class RecommendZhan {
    private String zhan_id;
    private String charge_cost_way2;
    private String distance;
    private double distanceDouble;
    private double distanceNum;
    private double score;
    private String pile_status;
@@ -56,6 +57,14 @@ public class RecommendZhan {
    private String stop_cost;
    private String fenshi_is;
    public double getDistanceDouble() {
        return distanceDouble;
    }
    public void setDistanceDouble(double distanceDouble) {
        this.distanceDouble = distanceDouble;
    }
    public String getFenshi_info() {
        return fenshi_info;
    }