().put("levellabel", levellabel); 239 
            MainApplication.level_one = JsonUtils.getKeyResult(levellabel, "1");
240 
            MainApplication.level_two = JsonUtils.getKeyResult(levellabel, "2");
241 
            MainApplication.level_three = JsonUtils.getKeyResult(levellabel, "3");
242 
            MainApplication.level_four = JsonUtils.getKeyResult(levellabel, "4");
243 
            MainApplication.level_five = JsonUtils.getKeyResult(levellabel, "5");
244 
        }
245
234 246 
        if (MainApplication.huodonglabel.equals("")) {
235 247 
            tv_huodong.setVisibility(View.GONE);
236 248 
        }

+ 2 - 2
app/src/main/java/com/electric/chargingpile/application/MainApplication.java
View File 

@ -77,8 +77,8 @@ public class MainApplication extends MultiDexApplication {
77 77 
    public static String firstPoint = "";
78 78 
    public static Boolean firstSsyd;
79 79 
    public static String password = "";
80 
    public static String url = "http://59.110.68.162";// 充电桩测试环境
81 
//        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
80 
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
81 
        public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
82 82 
//    public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
83 83 
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
84 84 
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";

+ 3 - 0
app/src/main/java/com/electric/chargingpile/view/HongBaoDialog.java
View File 

@ -83,4 +83,7 @@ public class HongBaoDialog {
83 83 
        dialog.show();
84 84 
    }
85 85
86 
    public void dismiss() {
87 
        dialog.dismiss();
88 
    }
86 89 
}

+ 76 - 0
app/src/main/java/com/electric/chargingpile/view/HongBaoResultDialog.java
View File 

@ -0,0 +1,76 @@
1 
package com.electric.chargingpile.view;
2
3 
import android.content.Context;
4 
import android.view.Display;
5 
import android.view.LayoutInflater;
6 
import android.view.View;
7 
import android.view.WindowManager;
8 
import android.widget.FrameLayout;
9 
import android.widget.ImageView;
10 
import android.widget.LinearLayout;
11 
import android.widget.TextView;
12
13 
import com.electric.chargingpile.R;
14
15 
/**
16 
 * Created by demon on 2017/5/25.
17 
 */
18
19 
public class HongBaoResultDialog {
20 
    private Context context;
21 
    private android.app.Dialog dialog;
22 
    private Display display;
23 
    private ImageView dialog_close;
24 
    private LinearLayout dialog_bg;
25
26 
    public HongBaoResultDialog(Context context) {
27 
        this.context = context;
28 
        WindowManager windowManager = (WindowManager) context
29 
                .getSystemService(Context.WINDOW_SERVICE);
30 
        display = windowManager.getDefaultDisplay();
31 
    }
32
33 
    public HongBaoResultDialog builder() {
34 
        // 获取Dialog布局
35 
        View view = LayoutInflater.from(context).inflate(
36 
                R.layout.dialog_hongbao_result, null);
37
38 
        // 获取自定义Dialog布局中的控件
39 
        dialog_bg = (LinearLayout) view.findViewById(R.id.dialog_bg);
40 
        dialog_close = (ImageView) view.findViewById(R.id.dialog_close);
41
42 
        // 定义Dialog布局和参数
43 
        dialog = new android.app.Dialog(context, R.style.AlertDialogStyle);
44 
        dialog.setContentView(view);
45
46 
        // 调整dialog背景大小
47 
        dialog_bg.setLayoutParams(new FrameLayout.LayoutParams((int) (display
48 
                .getWidth() * 0.85), LinearLayout.LayoutParams.WRAP_CONTENT));
49
50 
        return this;
51 
    }
52
53 
    public HongBaoResultDialog setCancelable(boolean cancel) {
54 
        dialog.setCancelable(cancel);
55 
        dialog.setCanceledOnTouchOutside(cancel);
56 
        return this;
57 
    }
58
59 
    public void show() {
60 
        dialog_close.setOnClickListener(new View.OnClickListener() {
61 
            @Override
62 
            public void onClick(View view) {
63 
                try {
64 
                    dialog.dismiss();
65 
                } catch (Exception e) {
66 
                    e.printStackTrace();
67 
                }
68 
            }
69 
        });
70 
        dialog.show();
71 
    }
72
73 
    public void dismiss() {
74 
        dialog.dismiss();
75 
    }
76 
}

BIN
app/src/main/res/drawable-xxhdpi/icon_hongbao_result.png
View File


+ 3 - 11
app/src/main/res/layout/activity_charging_comment.xml
View File 

@ -145,14 +145,13 @@
145 145 
                android:layout_height="wrap_content">
146 146
147 147 
                <TextView
148 
                    android:id="@+id/tv_huodong"
148 149 
                    android:layout_width="wrap_content"
149 150 
                    android:layout_height="wrap_content"
150 
                    android:layout_centerVertical="true"
151 
                    android:textColor="@color/ui_62"
152 
                    android:textSize="14sp"
153 151 
                    android:layout_marginLeft="15dp"
154 152 
                    android:text="活动标签"
155 
                    android:id="@+id/tv_huodong"/>
153 
                    android:textColor="@color/ui_62"
154 
                    android:textSize="14sp" />
156 155
157 156 
                <com.zhy.view.flowlayout.TagFlowLayout
158 157 
                    android:id="@+id/id_flowlayout_activity"
 
@ -300,11 +299,4 @@
300 299
301 300 
    </RelativeLayout>
302 301
303
304
305
306
307
308
309
310 302 
</com.zhy.autolayout.AutoRelativeLayout>

+ 14 - 5
app/src/main/res/layout/dialog_hongbao.xml
View File 

@ -17,19 +17,28 @@
17 17 
            android:layout_gravity="center_horizontal"
18 18 
            android:textSize="18sp"
19 19 
            android:textColor="@color/ui_62"
20 
            android:text="恭喜您获得红包!"
20 
            android:text="分享领红包"
21 21 
            android:layout_marginTop="45dp"/>
22 22
23 23 
        <TextView
24 24 
            android:layout_width="wrap_content"
25 25 
            android:layout_height="wrap_content"
26 26 
            android:layout_gravity="center_horizontal"
27 
            android:layout_marginTop="10dp"
28 
            android:layout_marginBottom="5dp"
27 29 
            android:gravity="center_horizontal"
28 
            android:textSize="15sp"
30 
            android:text="分享红包给其他小伙伴吧"
29 31 
            android:textColor="@color/ui_65"
30 
            android:text="分享红包给小伙伴一起抢"
31 
            android:layout_marginTop="10dp"
32 
            android:layout_marginBottom="37dp"/>
32 
            android:textSize="15sp" />
33 
        <TextView
34 
            android:layout_width="wrap_content"
35 
            android:layout_height="wrap_content"
36 
            android:layout_gravity="center_horizontal"
37 
            android:layout_marginBottom="37dp"
38 
            android:gravity="center_horizontal"
39 
            android:text="分享成功后您可自动领取随机红包哦"
40 
            android:textColor="@color/ui_65"
41 
            android:textSize="15sp" />
33 42
34 43 
        <ImageView
35 44 
            android:layout_width="wrap_content"

+ 30 - 0
app/src/main/res/layout/dialog_hongbao_result.xml
View File 

@ -0,0 +1,30 @@
1 
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
2 
    xmlns:tools="http://schemas.android.com/tools"
3 
    android:id="@+id/dialog_bg"
4 
    android:layout_width="match_parent"
5 
    android:layout_height="match_parent"
6 
    android:orientation="vertical">
7
8 
    <LinearLayout
9 
        android:id="@+id/dialog_layout"
10 
        android:layout_width="290dp"
11 
        android:layout_height="290dp"
12 
        android:layout_gravity="center_horizontal"
13 
        android:gravity="center"
14 
        android:orientation="vertical">
15
16 
        <ImageView
17 
            android:layout_width="wrap_content"
18 
            android:layout_height="wrap_content"
19 
            android:src="@drawable/icon_hongbao_result" />
20 
    </LinearLayout>
21
22 
    <ImageView
23 
        android:id="@+id/dialog_close"
24 
        android:layout_width="wrap_content"
25 
        android:layout_height="wrap_content"
26 
        android:layout_gravity="center_horizontal"
27 
        android:layout_marginTop="44dp"
28 
        android:src="@drawable/icon_dialog_close" />
29
30 
</LinearLayout>

桩详情页面开发完成 · b20d745808 - Gogs: Go Git Service
Home Explore Help
Register Sign In
dudu
/
cdzApp
Watch 2
Star 1
Fork 0
Code Issues 0 Pull Requests 0 Commits 346 Releases 18 Wiki
Browse Source

桩详情页面开发完成

huyuguo 6 years ago
parent
d5730d80c6
commit
b20d745808
8 changed files with 81 additions and 91 deletions
Split View Show Diff Stats
  1. 2 2
      app/src/main/AndroidManifest.xml
  2. 31 32
      app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
  3. BIN
      app/src/main/res/drawable-hdpi/right_cursor.png
  4. BIN
      app/src/main/res/drawable-mdpi/right_cursor.png
  5. BIN
      app/src/main/res/drawable-xhdpi/right_cursor.png
  6. BIN
      app/src/main/res/drawable-xxhdpi/right_cursor.png
  7. BIN
      app/src/main/res/drawable-xxxhdpi/right_cursor.png
  8. 48 57
      app/src/main/res/layout/fragmen_details_new.xml

+ 2 - 2
app/src/main/AndroidManifest.xml
View File 

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

+ 31 - 32
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java
View File 

@ -11,7 +11,9 @@ import android.os.Build;
11 11 
import android.os.Bundle;
12 12 
import android.os.Handler;
13 13 
import android.os.Message;
14
14 15 
import androidx.fragment.app.Fragment;
16
15 17 
import android.text.SpannableString;
16 18 
import android.text.Spanned;
17 19 
import android.text.style.ForegroundColorSpan;
 
@ -39,6 +41,7 @@ import com.electric.chargingpile.activity.PriceDetailsActivity;
39 41 
import com.electric.chargingpile.application.MainApplication;
40 42 
import com.electric.chargingpile.data.ChartData;
41 43 
import com.electric.chargingpile.data.MyOtto;
44 
import com.electric.chargingpile.data.PileData;
42 45 
import com.electric.chargingpile.data.RankinglistRefreshEvent;
43 46 
import com.electric.chargingpile.data.Zhan;
44 47 
import com.electric.chargingpile.util.CommonParams;
 
@ -93,6 +96,7 @@ import java.net.URLEncoder;
93 96 
import java.security.MessageDigest;
94 97 
import java.text.SimpleDateFormat;
95 98 
import java.util.ArrayList;
99 
import java.util.Calendar;
96 100 
import java.util.Date;
97 101 
import java.util.HashMap;
98 102 
import java.util.List;
 
@ -126,7 +130,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
126 130 
    private TextView tv_claimer, tv_grade;
127 131 
    private View view_789;
128 132 
    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;
129 
    private TextView tv_cost_info, tv_current_charging, tv_detail_charging_enter;
133 
    private TextView current_time_slot, tv_detail_charging_enter;
134 
    private LinearLayout tv_cost_info;
130 135 
    private LinearLayout ll_no_fenshi, ll_yes_fenshi;
131 136 
    private TextView tv_today_num;
132 137 
@ -258,7 +263,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
258 263 
                        other_cost = JsonUtils.getKeyResult(info_decode, "other_cost");
259 264 
                        work_open = JsonUtils.getKeyResult(info_decode, "work_open");
260 265 
                        work_close = JsonUtils.getKeyResult(info_decode, "work_close");
261
266 
                        zongjia = JsonUtils.getKeyResult(info_decode, "zongjia");
262 267 
                        String park_location = JsonUtils.getKeyResult(info_decode, "park_location");
263 268 
                        String own_pay = JsonUtils.getKeyResult(info_decode, "own_pay");
264 269 
                        if (detailsFragmentListener != null) {
 
@ -293,23 +298,20 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
293 298 
                            } else {
294 299 
                                ll_no_fenshi.setVisibility(View.GONE);
295 300 
                                ll_yes_fenshi.setVisibility(View.VISIBLE);
296 
                                SimpleDateFormat formatter = new SimpleDateFormat("HH:mm");
297 
                                Date curDate = new Date(System.currentTimeMillis());
298 
                                String token = formatter.format(curDate);
299
300 
                                String t = String.valueOf(DateUtils.getShortStringToDate(token));
301 
                                for (int i = 0; i < datas.size(); i++) {
302 
                                    if (Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("start")))) < Integer.parseInt(t)
303 
                                            && Integer.parseInt(String.valueOf(DateUtils.getShortStringToDate(datas.get(i).getString("end")))) > Integer.parseInt(t)) {
304 
                                        double c = Double.parseDouble(datas.get(i).getString("charge_free"));
305 
                                        BigDecimal bd = new BigDecimal(c);
306 
                                        double d = bd.setScale(2, BigDecimal.ROUND_HALF_UP).doubleValue();
307 
                                        double d_service = Double.parseDouble(datas.get(i).getString("service_free"));
308 
                                        tv_current_charging.setText(d + "元/度");
309 
                                        detail_serve_cost_two.setText(d_service + "元/度");
301
302 
                                Calendar calendar = Calendar.getInstance();
303 
                                int hours = calendar.get(Calendar.HOUR_OF_DAY);
304 
                                int minutes = calendar.get(Calendar.MINUTE);
305 
                                int totalMinutes = hours * 60 + minutes;
306
307 
                                for (JSONObject obj : DetailsFragment.datas) {
308 
                                    PileData.FenshiInfoBean bean = JsonUtils.parseToObjectBean(obj.toString(), PileData.FenshiInfoBean.class);
309 
                                    if (totalMinutes >= bean.getStartTotalMinutes() && totalMinutes <= bean.getEndTotalMinutes()) {
310 
                                        current_time_slot.setText("当前时间段 " + bean.getStart() + "-" + bean.getEnd());
310 311 
                                        break;
311 312 
                                    }
312 313 
                                }
314 
                                total_price.setText(zongjia);
313 315 
                            }
314 316 
                        } else {
315 317 
                            ll_no_fenshi.setVisibility(View.VISIBLE);
 
@ -332,15 +334,12 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
332 334 
                            acableNum = JsonUtils.getKeyResult(info_decode, "acableNum");
333 335 
                            dcableNum = JsonUtils.getKeyResult(info_decode, "dcableNum");
334 336 
                            freeStatus = "1"; // 有状态的站点
335 
//                            Log.e("dcableNum",dcableNum);
336 337 
                        } else {
337 338 
                            freeStatus = "0"; // 无状态的站点
338 339 
                        }
339 340
340
341 341 
                        detail_zhan_name.setText(zhan_name);
342 342
343
344 343 
                        if (supplier.equals("")) {
345 344 
                            detail_supplier.setText("暂无");
346 345 
                        } else {
 
@ -791,6 +790,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
791 790 
        }
792 791 
    };
793 792 
    private ImageView parking_icon;
793 
    private String zongjia;
794 794
795 795 
    @Override
796 796 
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
 
@ -855,7 +855,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
855 855
856 856 
    private TextView detail_address, detail_grade, detail_picnum, detail_zhan_distance,
857 857 
            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,
858 
            detail_supplier, detail_cost, detail_serve_cost, detail_serve_cost_two,
858 
            detail_supplier, detail_cost, detail_serve_cost, total_price,
859 859 
            details_claimer;
860 860 
    private AlignTextView detail_charge_cost;
861 861 
    private AlignTextView detail_park_cost;
 
@ -878,11 +878,10 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
878 878 
        ll_no_fenshi = (LinearLayout) v.findViewById(R.id.ll_no_fenshi);
879 879 
        ll_yes_fenshi = (LinearLayout) v.findViewById(R.id.ll_yes_fenshi);
880 880
881 
        tv_cost_info = (TextView) v.findViewById(R.id.tv_cost_info);
882 
        if (tv_cost_info != null) {
883 
            tv_cost_info.setOnClickListener(this);
884 
        }
885 
        tv_current_charging = (TextView) v.findViewById(R.id.tv_current_charging);
881 
        tv_cost_info = v.findViewById(R.id.tv_cost_info);
882 
        tv_cost_info.setOnClickListener(this);
883
884 
        current_time_slot = (TextView) v.findViewById(R.id.current_time_slot);
886 885 
        iv_level_img = (ImageView) v.findViewById(R.id.iv_level_img);
887 886 
        detail_view = v.findViewById(R.id.detail_view);
888 887 
        detail_claimer_remark = (LinearLayout) v.findViewById(R.id.detail_claimer_remark);
 
@ -911,7 +910,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
911 910 
        detail_cost = (TextView) v.findViewById(R.id.detail_cost);
912 911 
        detail_charge_cost = (AlignTextView) v.findViewById(R.id.detail_charge_cost);
913 912 
        detail_serve_cost = (TextView) v.findViewById(R.id.detail_serve_cost);
914 
        detail_serve_cost_two = (TextView) v.findViewById(R.id.detail_serve_cost_two);
913 
        total_price = (TextView) v.findViewById(R.id.total_price);
915 914 
        detail_park_cost = (AlignTextView) v.findViewById(R.id.detail_park_cost);
916 915 
        detail_time = (AlignTextView) v.findViewById(R.id.detail_time);
917 916 
        detail_list_num = (TextView) v.findViewById(R.id.detail_list_num);
 
@ -985,7 +984,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
985 984 
                if ("1".equals(freeStatus)) { // 有状态的站点
986 985 
                    if ("0".equals(acableNum) && "0".equals(dcableNum)) { // 无空闲桩
987 986 
                        ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_THIRD);
988 
                        reportParkingDialogFragment.show(getFragmentManager(),"没有充电车位");
987 
                        reportParkingDialogFragment.show(getFragmentManager(), "没有充电车位");
989 988 
                        MobclickAgent.onEvent(getContext(), "1127");
990 989 
                    } else {
991 990 
                        if (MainApplication.center == null) {
 
@ -994,7 +993,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
994 993 
                            double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
995 994 
                            if (distance > 100) {
996 995 
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
997 
                                reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
996 
                                reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
998 997 
                            } else {
999 998 
                                ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
1000 999 
                                reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
 
@ -1003,7 +1002,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1003 1002 
                                        addVacancy();
1004 1003 
                                    }
1005 1004 
                                });
1006 
                                reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
1005 
                                reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
1007 1006 
                            }
1008 1007 
                            MobclickAgent.onEvent(getContext(), "1126");
1009 1008 
                        }
 
@ -1015,7 +1014,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1015 1014 
                        double distance = AMapUtils.calculateLineDistance(MainApplication.center, latLng);
1016 1015 
                        if (distance > 100) {
1017 1016 
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_FIRST);
1018 
                            reportParkingDialogFragment.show(getFragmentManager(),"超过100米，无法上报充电车位");
1017 
                            reportParkingDialogFragment.show(getFragmentManager(), "超过100米，无法上报充电车位");
1019 1018 
                        } else {
1020 1019 
                            ReportParkingDialogFragment reportParkingDialogFragment = ReportParkingDialogFragment.newInstance(ReportParkingDialogFragment.TYPE_SECOND);
1021 1020 
                            reportParkingDialogFragment.setOnReportParkingDialogFragmentListener(new ReportParkingDialogFragment.OnReportParkingDialogFragmentListener() {
 
@ -1024,7 +1023,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1024 1023 
                                    addVacancy();
1025 1024 
                                }
1026 1025 
                            });
1027 
                            reportParkingDialogFragment.show(getFragmentManager(),"上报车位");
1026 
                            reportParkingDialogFragment.show(getFragmentManager(), "上报车位");
1028 1027 
                        }
1029 1028 
                        MobclickAgent.onEvent(getContext(), "1126");
1030 1029 
                    }
 
@ -1622,7 +1621,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1622 1621 
     */
1623 1622
1624 1623 
    private void addVacancy() {
1625 
        if (!MainApplication.isLogin()){
1624 
        if (!MainApplication.isLogin()) {
1626 1625 
            startActivity(new Intent(getActivity().getApplicationContext(), LoginActivity.class));
1627 1626 
            ToastUtil.showToast(getActivity().getApplicationContext(), "请先登录", Toast.LENGTH_SHORT);
1628 1627 
            return;

BIN
app/src/main/res/drawable-hdpi/right_cursor.png
View File


BIN
app/src/main/res/drawable-mdpi/right_cursor.png
View File


BIN
app/src/main/res/drawable-xhdpi/right_cursor.png
View File


BIN
app/src/main/res/drawable-xxhdpi/right_cursor.png
View File


BIN
app/src/main/res/drawable-xxxhdpi/right_cursor.png
View File


+ 48 - 57
app/src/main/res/layout/fragmen_details_new.xml
View File 

@ -249,6 +249,7 @@
249 249 
                            android:layout_gravity="center_vertical"
250 250 
                            android:paddingRight="10dp"
251 251 
                            android:src="@drawable/slow_icon" />
252
252 253 
                        <TextView
253 254 
                            android:id="@+id/window_tv_slow_free_label"
254 255 
                            android:layout_width="wrap_content"
 
@ -434,85 +435,75 @@
434 435
435 436 
                </LinearLayout>
436 437
438 
                <!-- 分时电价显示 -->
437 439 
                <LinearLayout
438 440 
                    android:id="@+id/ll_yes_fenshi"
439 441 
                    android:layout_width="match_parent"
440 442 
                    android:layout_height="wrap_content"
441 
                    android:orientation="vertical"
442 
                    android:visibility="gone">
443
444 
                    <RelativeLayout
445 
                        android:layout_width="match_parent"
446 
                        android:layout_height="match_parent">
443 
                    android:orientation="horizontal"
444 
                    android:visibility="gone"
445 
                    tools:visibility="visible">
447 446
448 
                        <TextView
449 
                            android:layout_width="wrap_content"
450 
                            android:layout_height="wrap_content"
451 
                            android:layout_alignParentLeft="true"
452 
                            android:text="支付信息"
453 
                            android:textColor="@color/ui_65"
454 
                            android:textSize="14sp" />
447 
                    <LinearLayout
448 
                        android:layout_width="0dp"
449 
                        android:layout_height="wrap_content"
450 
                        android:layout_weight="3"
451 
                        tools:background="#00ff00"
452 
                        android:orientation="vertical">
455 453
456 
                        <TextView
457 
                            android:id="@+id/tv_cost_info"
454 
                        <LinearLayout
458 455 
                            android:layout_width="wrap_content"
459 456 
                            android:layout_height="wrap_content"
460 
                            android:layout_alignParentRight="true"
461 
                            android:gravity="right"
462 
                            android:text="电价详情"
463 
                            android:textColor="@color/lvse"
464 
                            android:textSize="14sp" />
465
466 
                    </RelativeLayout>
457 
                            android:orientation="horizontal">
467 458
468 
                    <RelativeLayout
469 
                        android:layout_width="match_parent"
470 
                        android:layout_height="match_parent"
471 
                        android:layout_marginTop="10dp">
459 
                            <TextView
460 
                                android:id="@+id/total_price"
461 
                                android:layout_width="wrap_content"
462 
                                android:layout_height="wrap_content"
463 
                                android:textColor="#FA6400"
464 
                                android:textSize="20sp"
465 
                                android:textStyle="bold"
466 
                                tools:text="1.1406" />
472 467
473 
                        <TextView
474 
                            android:layout_width="wrap_content"
475 
                            android:layout_height="wrap_content"
476 
                            android:layout_alignParentLeft="true"
477 
                            android:text="当前电价"
478 
                            android:textColor="@color/ui_65"
479 
                            android:textSize="14sp" />
468 
                            <TextView
469 
                                android:layout_width="wrap_content"
470 
                                android:layout_height="wrap_content"
471 
                                android:text="元/度"
472 
                                android:textColor="#FA6400"
473 
                                android:textSize="12sp" />
474 
                        </LinearLayout>
480 475
481 476 
                        <TextView
482 
                            android:id="@+id/tv_current_charging"
477 
                            android:id="@+id/current_time_slot"
483 478 
                            android:layout_width="wrap_content"
484 479 
                            android:layout_height="wrap_content"
485 
                            android:layout_alignParentRight="true"
486 
                            android:text="0.8元/度"
487 
                            android:textColor="@color/ui_65"
488 
                            android:textSize="14sp" />
480 
                            android:paddingTop="2dp"
481 
                            android:textColor="@color/color_888888"
482 
                            android:textSize="12sp"
483 
                            tools:text="当前时段 09:00-12:00" />
489 484
490 
                    </RelativeLayout>
485 
                    </LinearLayout>
491 486
492 
                    <RelativeLayout
493 
                        android:layout_width="match_parent"
487 
                    <LinearLayout
488 
                        android:id="@+id/tv_cost_info"
489 
                        android:layout_width="0dp"
494 490 
                        android:layout_height="match_parent"
495 
                        android:layout_marginTop="10dp">
491 
                        android:layout_weight="2"
492 
                        tools:background="#ff0000"
493 
                        android:gravity="center_vertical|right">
496 494
497 495 
                        <TextView
498 496 
                            android:layout_width="wrap_content"
499 497 
                            android:layout_height="wrap_content"
500 
                            android:layout_alignParentLeft="true"
501 
                            android:text="服务费用"
502 
                            android:textColor="@color/ui_65"
498 
                            android:paddingRight="2dp"
499 
                            android:text="电价详情"
500 
                            android:textColor="@color/color_222222"
503 501 
                            android:textSize="14sp" />
504
505 
                        <TextView
506 
                            android:id="@+id/detail_serve_cost_two"
502 
                        <ImageView
507 503 
                            android:layout_width="wrap_content"
508 504 
                            android:layout_height="wrap_content"
509 
                            android:layout_alignParentRight="true"
510 
                            android:text=""
511 
                            android:textColor="@color/ui_65"
512 
                            android:textSize="14sp" />
513
514 
                    </RelativeLayout>
515
505 
                            android:src="@drawable/right_cursor" />
506 
                    </LinearLayout>
516 507 
                </LinearLayout>
517 508
518 509 
                <RelativeLayout
 
@ -847,8 +838,8 @@
847 838 
        android:layout_marginBottom="15dp"
848 839 
        android:src="@drawable/detail_report_parking"
849 840 
        android:visibility="gone"
850 
        tools:visibility="visible"
851 841 
        app:layout_constraintBottom_toBottomOf="parent"
852 
        app:layout_constraintRight_toRightOf="parent" />
842 
        app:layout_constraintRight_toRightOf="parent"
843 
        tools:visibility="visible" />
853 844
854 845 
</androidx.constraintlayout.widget.ConstraintLayout>