桩详情页面开发完成

app/src/main/AndroidManifest.xml

@@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    xmlns:tools="http://schemas.android.com/tools"
    package="com.electric.chargingpile"
    android:versionCode="91"
    android:versionName="3.5.3">
    android:versionCode="88"
    android:versionName="3.5.0">
    <uses-permission android:name="android.permission.BLUETOOTH" />
    <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />

app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@@ -11,7 +11,9 @@ import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import androidx.fragment.app.Fragment;
import android.text.SpannableString;
import android.text.Spanned;
import android.text.style.ForegroundColorSpan;
@@ -39,6 +41,7 @@ import com.electric.chargingpile.activity.PriceDetailsActivity;
import com.electric.chargingpile.application.MainApplication;
import com.electric.chargingpile.data.ChartData;
import com.electric.chargingpile.data.MyOtto;
import com.electric.chargingpile.data.PileData;
import com.electric.chargingpile.data.RankinglistRefreshEvent;
import com.electric.chargingpile.data.Zhan;
import com.electric.chargingpile.util.CommonParams;
@@ -93,6 +96,7 @@ import java.net.URLEncoder;
import java.security.MessageDigest;
import java.text.SimpleDateFormat;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
@@ -126,7 +130,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
    private TextView tv_claimer, tv_grade;
    private View view_789;
    String zhan_name, zhan_id, tid, zhan_address, supplier, total_num, fast_num, slow_num, stop_cost, charge_cost, telephone, remarks, suit_car, claimer, belong_attribute, poi_jing, poi_wei, charge_cost_way, other_cost, work_open, work_close;
    private TextView tv_cost_info, tv_current_charging, tv_detail_charging_enter;
    private TextView current_time_slot, tv_detail_charging_enter;
    private LinearLayout tv_cost_info;
    private LinearLayout ll_no_fenshi, ll_yes_fenshi;
    private TextView tv_today_num;
@@ -258,7 +263,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                        other_cost = JsonUtils.getKeyResult(info_decode, "other_cost");
                        work_open = JsonUtils.getKeyResult(info_decode, "work_open");
                        work_close = JsonUtils.getKeyResult(info_decode, "work_close");
                        zongjia = JsonUtils.getKeyResult(info_decode, "zongjia");
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
                        if (detailsFragmentListener != null) {
@@ -293,23 +298,20 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                            } else {
                                ll_no_fenshi.setVisibility(View.GONE);
                                ll_yes_fenshi.setVisibility(View.VISIBLE);
                                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
                                Date curDate = new Date(System.currentTimeMillis());
                                String token = formatter.format(curDate);
                                String t = String.valueOf(DateUtils.getShortStringToDate(token));
                                for (int i = 0; i < datas.size(); i++) {
                                    if (Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("start")))) < Integer.parseInt(t)
                                            && Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("end")))) > Integer.parseInt(t)) {
                                        double c = Double.parseDouble(datas.get(i).getString("charge_free"));
                                        BigDecimal bd = new BigDecimal(c);
                                        double d = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
                                        double d_service = Double.parseDouble(datas.get(i).getString("service_free"));
                                        tv_current_charging.setText(d + "元/度");
                                        detail_serve_cost_two.setText(d_service + "元/度");
                                Calendar calendar = Calendar.getInstance();
                                int hours = calendar.get(Calendar.HOUR_OF_DAY);
                                int minutes = calendar.get(Calendar.MINUTE);
                                int totalMinutes = hours * 60 + minutes;
                                for (JSONObject obj : DetailsFragment.datas) {
                                    PileData.FenshiInfoBean bean = JsonUtils.parseToObjectBean(obj.toString(), PileData.FenshiInfoBean.class);
                                    if (totalMinutes >= bean.getStartTotalMinutes() && totalMinutes <= bean.getEndTotalMinutes()) {
                                        current_time_slot.setText("当前时间段 " + bean.getStart() + "-" + bean.getEnd());
                                        break;
                                    }
                                }
                                total_price.setText(zongjia);
                            }
                        } else {
                            ll_no_fenshi.setVisibility(View.VISIBLE);
@@ -332,15 +334,12 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                            acableNum = JsonUtils.getKeyResult(info_decode, "acableNum");
                            dcableNum = JsonUtils.getKeyResult(info_decode, "dcableNum");
                            freeStatus = "1"; // 有状态的站点
//                            Log.e("dcableNum",dcableNum);
                        } else {
                            freeStatus = "0"; // 无状态的站点
                        }
                        detail_zhan_name.setText(zhan_name);
                        if (supplier.equals("")) {
                            detail_supplier.setText("暂无");
                        } else {
@@ -791,6 +790,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        }
    };
    private ImageView parking_icon;
    private String zongjia;
    @Override
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@@ -855,7 +855,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
    private TextView detail_address, detail_grade, detail_picnum, detail_zhan_distance,
            window_tv_fast_total_num, window_tv_fast_free_label, window_tv_fast_free_num, window_tv_slow_total_num, window_tv_slow_free_label, window_tv_slow_free_num,
            detail_supplier, detail_cost, detail_serve_cost, detail_serve_cost_two,
            detail_supplier, detail_cost, detail_serve_cost, total_price,
            details_claimer;
    private AlignTextView detail_charge_cost;
    private AlignTextView detail_park_cost;
@@ -878,11 +878,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        ll_no_fenshi = (LinearLayout) v.findViewById(R.id.ll_no_fenshi);
        ll_yes_fenshi = (LinearLayout) v.findViewById(R.id.ll_yes_fenshi);
        tv_cost_info = (TextView) v.findViewById(R.id.tv_cost_info);
        if (tv_cost_info != null) {
            tv_cost_info.setOnClickListener(this);
        }
        tv_current_charging = (TextView) v.findViewById(R.id.tv_current_charging);
        tv_cost_info = v.findViewById(R.id.tv_cost_info);
        tv_cost_info.setOnClickListener(this);
        current_time_slot = (TextView) v.findViewById(R.id.current_time_slot);
        iv_level_img = (ImageView) v.findViewById(R.id.iv_level_img);
        detail_view = v.findViewById(R.id.detail_view);
        detail_claimer_remark = (LinearLayout) v.findViewById(R.id.detail_claimer_remark);
@@ -911,7 +910,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
        detail_cost = (TextView) v.findViewById(R.id.detail_cost);
        detail_charge_cost = (AlignTextView) v.findViewById(R.id.detail_charge_cost);
        detail_serve_cost = (TextView) v.findViewById(R.id.detail_serve_cost);
        detail_serve_cost_two = (TextView) v.findViewById(R.id.detail_serve_cost_two);
        total_price = (TextView) v.findViewById(R.id.total_price);
        detail_park_cost = (AlignTextView) v.findViewById(R.id.detail_park_cost);
        detail_time = (AlignTextView) v.findViewById(R.id.detail_time);
        detail_list_num = (TextView) v.findViewById(R.id.detail_list_num);
@@ -985,7 +984,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                if ("1".equals(freeStatus)) { // 有状态的站点
                    if ("0".equals(acableNum) && "0".equals(dcableNum)) { // 无空闲桩
                        ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_THIRD);
                        reportParkingDialogFragment.show(getFragmentManager(),"没有充电车位");
                        reportParkingDialogFragment.show(getFragmentManager(), "没有充电车位");
                        MobclickAgent.onEvent(getContext(), "1127");
                    } else {
                        if (MainApplication.center == null) {
@@ -994,7 +993,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                            double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
                            if (distance > 100) {
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
                                reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
                                reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
                            } else {
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
                                reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
@@ -1003,7 +1002,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                                        addVacancy();
                                    }
                                });
                                reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
                                reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
                            }
                            MobclickAgent.onEvent(getContext(), "1126");
                        }
@@ -1015,7 +1014,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                        double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
                        if (distance > 100) {
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
                            reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
                            reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
                        } else {
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
                            reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
@@ -1024,7 +1023,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
                                    addVacancy();
                                }
                            });
                            reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
                            reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
                        }
                        MobclickAgent.onEvent(getContext(), "1126");
                    }
@@ -1622,7 +1621,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
     */
    private void addVacancy() {
        if (!MainApplication.isLogin()){
        if (!MainApplication.isLogin()) {
            startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
            ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
            return;

app/src/main/res/layout/fragmen_details_new.xml

@@ -249,6 +249,7 @@
                            android:layout_gravity="center_vertical"
                            android:paddingRight="10dp"
                            android:src="@drawable/slow_icon" />
                        <TextView
                            android:id="@+id/window_tv_slow_free_label"
                            android:layout_width="wrap_content"
@@ -434,85 +435,75 @@
                </LinearLayout>
                <!-- 分时电价显示 -->
                <LinearLayout
                    android:id="@+id/ll_yes_fenshi"
                    android:layout_width="match_parent"
                    android:layout_height="wrap_content"
                    android:orientation="vertical"
                    android:visibility="gone">
                    <RelativeLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent">
                    android:orientation="horizontal"
                    android:visibility="gone"
                    tools:visibility="visible">
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentLeft="true"
                            android:text="支付信息"
                            android:textColor="@color/ui_65"
                            android:textSize="14sp" />
                    <LinearLayout
                        android:layout_width="0dp"
                        android:layout_height="wrap_content"
                        android:layout_weight="3"
                        tools:background="#00ff00"
                        android:orientation="vertical">
                        <TextView
                            android:id="@+id/tv_cost_info"
                        <LinearLayout
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentRight="true"
                            android:gravity="right"
                            android:text="电价详情"
                            android:textColor="@color/lvse"
                            android:textSize="14sp" />
                    </RelativeLayout>
                            android:orientation="horizontal">
                    <RelativeLayout
                        android:layout_width="match_parent"
                        android:layout_height="match_parent"
                        android:layout_marginTop="10dp">
                            <TextView
                                android:id="@+id/total_price"
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:textColor="#FA6400"
                                android:textSize="20sp"
                                android:textStyle="bold"
                                tools:text="1.1406" />
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentLeft="true"
                            android:text="当前电价"
                            android:textColor="@color/ui_65"
                            android:textSize="14sp" />
                            <TextView
                                android:layout_width="wrap_content"
                                android:layout_height="wrap_content"
                                android:text="元/度"
                                android:textColor="#FA6400"
                                android:textSize="12sp" />
                        </LinearLayout>
                        <TextView
                            android:id="@+id/tv_current_charging"
                            android:id="@+id/current_time_slot"
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentRight="true"
                            android:text="0.8元/度"
                            android:textColor="@color/ui_65"
                            android:textSize="14sp" />
                            android:paddingTop="2dp"
                            android:textColor="@color/color_888888"
                            android:textSize="12sp"
                            tools:text="当前时段 09:00-12:00" />
                    </RelativeLayout>
                    </LinearLayout>
                    <RelativeLayout
                        android:layout_width="match_parent"
                    <LinearLayout
                        android:id="@+id/tv_cost_info"
                        android:layout_width="0dp"
                        android:layout_height="match_parent"
                        android:layout_marginTop="10dp">
                        android:layout_weight="2"
                        tools:background="#ff0000"
                        android:gravity="center_vertical|right">
                        <TextView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentLeft="true"
                            android:text="服务费用"
                            android:textColor="@color/ui_65"
                            android:paddingRight="2dp"
                            android:text="电价详情"
                            android:textColor="@color/color_222222"
                            android:textSize="14sp" />
                        <TextView
                            android:id="@+id/detail_serve_cost_two"
                        <ImageView
                            android:layout_width="wrap_content"
                            android:layout_height="wrap_content"
                            android:layout_alignParentRight="true"
                            android:text=""
                            android:textColor="@color/ui_65"
                            android:textSize="14sp" />
                    </RelativeLayout>
                            android:src="@drawable/right_cursor" />
                    </LinearLayout>
                </LinearLayout>
                <RelativeLayout
@@ -847,8 +838,8 @@
        android:layout_marginBottom="15dp"
        android:src="@drawable/detail_report_parking"
        android:visibility="gone"
        tools:visibility="visible"
        app:layout_constraintBottom_toBottomOf="parent"
        app:layout_constraintRight_toRightOf="parent" />
        app:layout_constraintRight_toRightOf="parent"
        tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>