Pārlūkot izejas kodu

完成地锁dialog展示,完成站点气泡页的地锁、站点列表展示

hy 1 gadu atpakaļ
vecāks
revīzija
80b544674c

+ 7 - 1
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -113,6 +113,7 @@ import com.electric.chargingpile.data.ChargingShareBean;
113 113
import com.electric.chargingpile.data.City;
114 114
import com.electric.chargingpile.data.DataRefresh;
115 115
import com.electric.chargingpile.data.FindData;
116
import com.electric.chargingpile.data.LocksBean;
116 117
import com.electric.chargingpile.data.PileData;
117 118
import com.electric.chargingpile.data.UpdateZhanDataBean;
118 119
import com.electric.chargingpile.data.Zhan;
@ -714,6 +715,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
714 715
    private TextView windowLabelPublic;
715 716
    private TextView windowLabelGround;
716 717
    private TextView windowLabelFreePark;
718
    private TextView tvFloorLock;
717 719
    private ConstraintLayout windowChat;
718 720
    private LatLng markerPosition;
719 721
    private ImageView second_hand_car;
@ -1017,6 +1019,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1017 1019
        windowLabelPublic = findViewById(R.id.iv_label_public);
1018 1020
        windowLabelGround = findViewById(R.id.iv_label_ground);
1019 1021
        windowLabelFreePark = findViewById(R.id.iv_label_free_park);
1022
        tvFloorLock = findViewById(R.id.tvFloorLock);
1020 1023
//        windowChat = findViewById(R.id.iv_chat);
1021 1024
1022 1025
        windowGo = (RelativeLayout) findViewById(R.id.window_rl_go);
@ -4516,6 +4519,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
4516 4519
        final String zhan_name = JsonUtils.getKeyResult(info, "zhan_name");
4517 4520
        String stop_cost = JsonUtils.getKeyResult(info, "stop_cost");
4518 4521
        String own_pay = JsonUtils.getKeyResult(info, "own_pay"); // 1:可支付
4522
4519 4523
        String charge_cost_way2 = JsonUtils.getKeyResult(info, "charge_cost_way2");
4520 4524
        final String charge_cost_way = JsonUtils.getKeyResult(info, "charge_cost_way");
4521 4525
        String other_cost = JsonUtils.getKeyResult(info, "other_cost");
@ -4532,6 +4536,8 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
4532 4536
        final String poi_jing = JsonUtils.getKeyResult(info, "poi_jing");
4533 4537
        final String poi_wei = JsonUtils.getKeyResult(info, "poi_wei");
4534 4538
        final String fenshi_is = JsonUtils.getKeyResult(info, "fenshi_is");
4539
        String locks = JsonUtils.getKeyResult(info, "locks");
4540
        ArrayList<LocksBean> locksBeans = (ArrayList<LocksBean>) JsonUtils.parseToObjectList(locks, LocksBean.class);
4535 4541
        telephone = JsonUtils.getKeyResult(info, "telephone");
4536 4542
        TextView fenshi_info_textview = findViewById(R.id.fenshi_info_textview);
4537 4543
        fenshi_info_textview.setText("");
@ -4697,7 +4703,7 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
4697 4703
        windowLabelGround.setText("0".equals(park_location) ? "地下" : "地上");
4698 4704
        windowLabelFreePark.setVisibility(stop_cost.contains("免费") ? View.VISIBLE : View.GONE);
4699 4705
4700
4706
        tvFloorLock.setVisibility((locksBeans != null && locksBeans.size() != 0) ? View.VISIBLE : View.GONE);
4701 4707
        String acNum = null, dcNum = null, acableNum = null, dcableNum = null;
4702 4708
        if (null != JsonUtils.getKeyResult(info, "acNum")) {
4703 4709
            acNum = JsonUtils.getKeyResult(info, "acNum");

+ 6 - 0
app/src/main/java/com/electric/chargingpile/activity/RecommendChargingStationActivity.java

@ -34,6 +34,7 @@ import com.electric.chargingpile.util.BarColorUtil;
34 34
import com.electric.chargingpile.util.JsonUtils;
35 35
import com.electric.chargingpile.util.LoadingDialog;
36 36
import com.electric.chargingpile.util.Util;
37
import com.electric.chargingpile.view.LockStatusDialog;
37 38
import com.umeng.analytics.MobclickAgent;
38 39
39 40
import java.io.BufferedReader;
@ -205,6 +206,7 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
205 206
            final TextView window_tv_slow_total_num;
206 207
            final TextView fenshi_info_textview;
207 208
            final TextView parkingFee;
209
            final TextView tvLock;
208 210
209 211
            public ViewHolder(View itemView) {
210 212
                super(itemView);
@ -234,6 +236,7 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
234 236
                window_tv_slow_total_num = itemView.findViewById(R.id.window_tv_slow_total_num);
235 237
                fenshi_info_textview = itemView.findViewById(R.id.fenshi_info_textview);
236 238
                parkingFee = itemView.findViewById(R.id.parkingFee);
239
                tvLock = itemView.findViewById(R.id.tvLock);
237 240
238 241
            }
239 242
        }
@ -257,6 +260,9 @@ public class RecommendChargingStationActivity extends AppCompatActivity implemen
257 260
        @Override
258 261
        public void onBindViewHolder(ViewHolder holder, int position) {
259 262
            RecommendZhan recommendZhan = mList.get(position);
263
            holder.tvLock.setOnClickListener(v->{
264
                LockStatusDialog.newInstart().show(getSupportFragmentManager());
265
            });
260 266
            holder.station_item.setOnClickListener(new View.OnClickListener() {
261 267
                @Override
262 268
                public void onClick(View v) {

+ 54 - 0
app/src/main/java/com/electric/chargingpile/adapter/LockAdapter.java

@ -0,0 +1,54 @@
1
package com.electric.chargingpile.adapter;
2
3
import android.content.Context;
4
import android.view.LayoutInflater;
5
import android.view.View;
6
import android.view.ViewGroup;
7
8
import androidx.annotation.NonNull;
9
import androidx.recyclerview.widget.RecyclerView;
10
11
import com.electric.chargingpile.R;
12
import com.electric.chargingpile.util.ScreenUtils;
13
14
import org.jetbrains.annotations.NotNull;
15
16
public class LockAdapter extends RecyclerView.Adapter<LockAdapter.LockHodler> {
17
18
    private int mScreenWidth = 0;
19
    private Context mContext;
20
21
    public LockAdapter(Context context) {
22
        mContext = context;
23
        mScreenWidth = ScreenUtils.getScreenWidth(context);
24
    }
25
26
    @NonNull
27
    @NotNull
28
    @Override
29
    public LockHodler onCreateViewHolder(@NonNull @NotNull ViewGroup parent, int viewType) {
30
        View inflate = LayoutInflater.from(parent.getContext()).inflate(R.layout.item_lock, parent, false);
31
        ViewGroup.LayoutParams layoutParams = inflate.getLayoutParams();
32
        int width = (int) (mScreenWidth / 5F) - 24;
33
        layoutParams.width = width;
34
        layoutParams.height = width;
35
        inflate.setLayoutParams(layoutParams);
36
        return new LockHodler(inflate);
37
    }
38
39
    @Override
40
    public void onBindViewHolder(@NonNull @NotNull LockHodler holder, int position) {
41
42
    }
43
44
    @Override
45
    public int getItemCount() {
46
        return 7;
47
    }
48
49
    public class LockHodler extends RecyclerView.ViewHolder {
50
        public LockHodler(@NonNull @NotNull View itemView) {
51
            super(itemView);
52
        }
53
    }
54
}

+ 6 - 6
app/src/main/java/com/electric/chargingpile/application/MainApplication.java

@ -102,13 +102,13 @@ public class MainApplication extends MultiDexApplication implements CameraXConfi
102 102
    public static String firstPoint = "";
103 103
    public static Boolean firstSsyd;
104 104
    public static String password = "";
105
//    public static String url = "http://59.110.68.162";// 充电桩测试环境
106
//    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
107
    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
108
    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
105
    public static String url = "http://59.110.68.162";// 充电桩测试环境
106
    public static String pic_url = "http://59.110.68.162/zhannew/uploadfile/";
107
//    public static String url = "http://cdz.evcharge.cc";// 充电桩正式环境
108
//    public static String pic_url = "http://cdz.evcharge.cc/zhannew/uploadfile/";
109 109

110
//        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
111
    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
110
        public static String urlNew = "http://123.56.67.7:83/api/0300";// 一电测试环境
111
//    public static String urlNew = "https://api.touchev.com:83/api/0300";// 一电正式环境
112 112

113 113
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
114 114
    public static String CDN = "https://cdn-fs.d1ev.com";

+ 38 - 0
app/src/main/java/com/electric/chargingpile/data/LocksBean.java

@ -0,0 +1,38 @@
1
package com.electric.chargingpile.data;
2
3
public class LocksBean {
4
    /**
5
     * {
6
     *      "LockNum":"38507",
7
     *      "WorkplaceName":"",
8
     *      "LockStatus":2
9
     * }
10
     * */
11
    private String  LockNum;
12
    private String  WorkplaceName;
13
    private int  LockStatus;
14
15
    public String getLockNum() {
16
        return LockNum;
17
    }
18
19
    public void setLockNum(String lockNum) {
20
        LockNum = lockNum;
21
    }
22
23
    public String getWorkplaceName() {
24
        return WorkplaceName;
25
    }
26
27
    public void setWorkplaceName(String workplaceName) {
28
        WorkplaceName = workplaceName;
29
    }
30
31
    public int getLockStatus() {
32
        return LockStatus;
33
    }
34
35
    public void setLockStatus(int lockStatus) {
36
        LockStatus = lockStatus;
37
    }
38
}

+ 156 - 0
app/src/main/java/com/electric/chargingpile/view/LockStatusDialog.java

@ -0,0 +1,156 @@
1
package com.electric.chargingpile.view;
2
3
4
import android.Manifest;
5
import android.app.Dialog;
6
import android.content.Intent;
7
import android.net.Uri;
8
import android.os.Bundle;
9
import android.text.Html;
10
import android.view.LayoutInflater;
11
import android.view.View;
12
import android.view.ViewGroup;
13
import android.widget.TextView;
14
15
import androidx.annotation.NonNull;
16
import androidx.annotation.Nullable;
17
import androidx.fragment.app.DialogFragment;
18
import androidx.fragment.app.Fragment;
19
import androidx.fragment.app.FragmentManager;
20
import androidx.fragment.app.FragmentTransaction;
21
import androidx.recyclerview.widget.GridLayoutManager;
22
import androidx.recyclerview.widget.RecyclerView;
23
24
import com.blankj.utilcode.util.LogUtils;
25
import com.blankj.utilcode.util.ScreenUtils;
26
import com.electric.chargingpile.R;
27
import com.electric.chargingpile.activity.ZhanDetailsNew;
28
import com.electric.chargingpile.adapter.LockAdapter;
29
import com.google.android.material.bottomsheet.BottomSheetBehavior;
30
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
31
32
import org.jetbrains.annotations.NotNull;
33
34
import pub.devrel.easypermissions.AfterPermissionGranted;
35
import pub.devrel.easypermissions.EasyPermissions;
36
37
import static android.text.Html.FROM_HTML_MODE_LEGACY;
38
39
public class LockStatusDialog extends BottomSheetDialogFragment {
40
41
    private String licensePlate = "";
42
    private String telNum = "10086";
43
    private View.OnClickListener onClickListener;
44
    private static final int RC_TELL_PERM = 124;
45
    public void setOnClickListener(View.OnClickListener onClickListener) {
46
        this.onClickListener = onClickListener;
47
    }
48
49
    public String getLicensePlate() {
50
        return licensePlate;
51
    }
52
53
    public void setLicensePlate(String licensePlate) {
54
        this.licensePlate = licensePlate;
55
    }
56
57
    public static LockStatusDialog newInstart(){
58
        return new LockStatusDialog();
59
    }
60
61
    @Override
62
    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
63
        super.onCreate(savedInstanceState);
64
        setStyle(DialogFragment.STYLE_NORMAL, R.style.TransparentVideoDialogFragmentTheme);
65
66
    }
67
68
    @Override
69
    public void onStart() {
70
        super.onStart();
71
        Dialog dialog = getDialog();
72
        if (dialog!=null){
73
            View bottomSheet = dialog.findViewById(com.google.android.material.R.id.design_bottom_sheet);
74
            if (bottomSheet!=null){
75
                ViewGroup.LayoutParams newLayoutParams = bottomSheet.getLayoutParams();
76
                int height = (int) (ScreenUtils.getScreenHeight() * 0.54);
77
                newLayoutParams.height = height;
78
                BottomSheetBehavior<View> behavior = BottomSheetBehavior.from(bottomSheet);
79
                if (behavior!=null){
80
                    behavior.setPeekHeight(height);
81
                    behavior.setState(BottomSheetBehavior.STATE_EXPANDED);
82
                }
83
            }
84
        }
85
    }
86
87
    @Nullable
88
    @org.jetbrains.annotations.Nullable
89
    @Override
90
    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
91
        return LayoutInflater.from(requireContext()).inflate(R.layout.dialog_lock_status, container, false);
92
    }
93
94
    @Override
95
    public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
96
        super.onViewCreated(view, savedInstanceState);
97
        RecyclerView recyclerView = view.findViewById(R.id.recyclerView);
98
        TextView tvRefresh = view.findViewById(R.id.tvRefresh);
99
        TextView tvContact = view.findViewById(R.id.tvContact);
100
        TextView tvNum = view.findViewById(R.id.tvNum);
101
102
        recyclerView.setLayoutManager( new GridLayoutManager(requireContext(),5));
103
        recyclerView.setAdapter(new LockAdapter(requireContext()));
104
105
        tvNum.setText(Html.fromHtml("空 <font color='#333333'>"+6+"/</font> <font color='#A5A5A5'>"+2+"</font>",FROM_HTML_MODE_LEGACY));
106
        tvContact.setOnClickListener(v->{
107
            //拨打电话
108
            tellTask();
109
        });
110
        tvRefresh.setOnClickListener(v->{
111
            //刷新接口
112
113
        });
114
115
    }
116
117
    @AfterPermissionGranted(RC_TELL_PERM)
118
    public void tellTask() {
119
        if (hasTellPermission()) {
120
            Intent intent = new Intent();
121
            intent.setAction("android.intent.action.CALL");
122
            intent.addCategory("android.intent.category.DEFAULT");
123
            intent.setData(Uri.parse("tel:" + telNum));
124
            startActivity(intent);
125
        } else {
126
            LogUtils.e("@@@@@@@");
127
            // Ask for one permission
128
            EasyPermissions.requestPermissions(
129
                    this,
130
                    "该功能需要开启拨号权限,是否前往开启?",
131
                    RC_TELL_PERM,
132
                    Manifest.permission.CALL_PHONE);
133
        }
134
    }
135
    private boolean hasTellPermission() {
136
        return EasyPermissions.hasPermissions(requireContext(), Manifest.permission.CALL_PHONE);
137
    }
138
139
    @Override
140
    public void onRequestPermissionsResult(int requestCode, @NonNull @NotNull String[] permissions, @NonNull @NotNull int[] grantResults) {
141
        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
142
        EasyPermissions.onRequestPermissionsResult(requestCode, permissions, grantResults, this);
143
    }
144
145
146
    public void show(FragmentManager fragmentManager){
147
        FragmentTransaction ft = fragmentManager.beginTransaction();
148
        Fragment prev = fragmentManager.findFragmentByTag(LockStatusDialog.class.getName());
149
        if (prev != null) {
150
            ft.remove(prev);
151
        }
152
        show(fragmentManager,LockStatusDialog.class.getName());
153
        fragmentManager.executePendingTransactions();
154
    }
155
156
}

BIN
app/src/main/res/drawable-xxhdpi/ic_lock.png


+ 9 - 0
app/src/main/res/drawable/bg_dialog_lock_status.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="@color/white" />
6
            <corners android:topLeftRadius="20dp" android:topRightRadius="20dp" android:bottomLeftRadius="0dp" android:bottomRightRadius="0dp" />
7
        </shape>
8
    </item>
9
</selector>

+ 10 - 0
app/src/main/res/drawable/bg_lock_contact.xml

@ -0,0 +1,10 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid  android:color="@color/color_3ec34c" />
6
            <corners android:radius="6dp" />
7
        </shape>
8
    </item>
9
10
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_lock_recommend.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <solid android:color="@color/color_3ec34c" />
6
            <corners android:radius="4dp" />
7
        </shape>
8
    </item>
9
</selector>

+ 9 - 0
app/src/main/res/drawable/bg_lock_refresh.xml

@ -0,0 +1,9 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
    <item >
4
        <shape android:shape="rectangle">
5
            <stroke android:width="1dp" android:color="@color/color_3ec34c" />
6
            <corners android:radius="6dp" />
7
        </shape>
8
    </item>
9
</selector>

+ 11 - 1
app/src/main/res/layout/activity_main_map.xml

@ -936,7 +936,7 @@
936 936
        android:layout_alignParentBottom="true"
937 937
        android:background="@color/white"
938 938
        android:visibility="gone"
939
        tools:visibility="gone">
939
        tools:visibility="visible">
940 940
941 941
        <LinearLayout
942 942
            android:layout_width="match_parent"
@ -1143,6 +1143,16 @@
1143 1143
                    android:text="免费停车"
1144 1144
                    android:textColor="#828282"
1145 1145
                    android:textSize="11dp" />
1146
                <TextView
1147
                    android:id="@+id/tvFloorLock"
1148
                    android:layout_width="34dp"
1149
                    android:layout_height="18dp"
1150
                    android:layout_marginLeft="5dp"
1151
                    android:background="@drawable/label_round_border"
1152
                    android:gravity="center"
1153
                    android:text="地锁"
1154
                    android:textColor="#828282"
1155
                    android:textSize="11dp" />
1146 1156
1147 1157
                <TextView
1148 1158
                    android:id="@+id/fenshi_info_textview"

+ 102 - 0
app/src/main/res/layout/dialog_lock_status.xml

@ -0,0 +1,102 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    xmlns:tools="http://schemas.android.com/tools"
4
    android:layout_width="match_parent"
5
    xmlns:app="http://schemas.android.com/apk/res-auto"
6
    tools:background="#f1f1"
7
    android:layout_height="match_parent">
8
    <LinearLayout
9
        android:orientation="vertical"
10
        android:background="@drawable/bg_dialog_lock_status"
11
        android:layout_width="match_parent"
12
        android:paddingTop="20dp"
13
        android:paddingStart="12dp"
14
        android:paddingEnd="12dp"
15
        android:paddingBottom="30dp"
16
        android:layout_height="match_parent">
17
        <TextView
18
            app:layout_constraintEnd_toEndOf="parent"
19
            app:layout_constraintStart_toStartOf="parent"
20
            app:layout_constraintTop_toTopOf="parent"
21
            android:layout_width="match_parent"
22
            android:layout_height="wrap_content"
23
            android:text="降地锁"
24
            android:textStyle="bold"
25
            android:gravity="center"
26
            android:textColor="@color/color_0e0e0e"
27
            android:textSize="16sp"
28
            />
29
30
        <LinearLayout
31
            android:layout_marginTop="31dp"
32
            android:layout_width="match_parent"
33
            android:layout_height="wrap_content">
34
            <TextView
35
                app:layout_constraintStart_toStartOf="parent"
36
                android:layout_width="0dp"
37
                android:layout_weight="1"
38
                android:layout_height="wrap_content"
39
                android:text="请选择地锁编号"
40
                android:textColor="@color/editcolor"
41
                android:textSize="14sp"
42
                />
43
44
            <TextView
45
                android:id="@+id/tvNum"
46
                android:drawablePadding="3dp"
47
                tools:text="空6/6"
48
                android:textColor="@color/editcolor"
49
                android:textSize="12sp"
50
                android:layout_width="wrap_content"
51
                android:layout_height="wrap_content"
52
                android:drawableStart="@drawable/ic_lock"
53
                />
54
        </LinearLayout>
55
        <TextView
56
            android:layout_marginTop="10dp"
57
            app:layout_constraintStart_toStartOf="parent"
58
            app:layout_constraintTop_toBottomOf="@+id/tvLockCode"
59
            android:layout_width="wrap_content"
60
            android:layout_height="wrap_content"
61
            android:text="非法损坏地锁将追究赔偿"
62
            android:textColor="@color/color_3ec34c"
63
            android:textSize="12sp"
64
            />
65
        <androidx.recyclerview.widget.RecyclerView
66
            android:layout_marginTop="13dp"
67
            android:layout_width="match_parent"
68
            android:id="@+id/recyclerView"
69
            android:layout_weight="1"
70
            android:layout_marginBottom="13dp"
71
            android:layout_height="0dp"/>
72
73
        <LinearLayout
74
            android:layout_width="match_parent"
75
            android:layout_height="wrap_content">
76
            <TextView
77
                android:layout_weight="1"
78
                android:id="@+id/tvRefresh"
79
                android:layout_width="0dp"
80
                android:layout_height="42dp"
81
                android:layout_marginTop="5dp"
82
                android:gravity="center"
83
                android:text="刷新"
84
                android:textColor="@color/color_3ec34c"
85
                android:textSize="16sp"
86
                android:background="@drawable/bg_lock_refresh" />
87
            <TextView
88
                android:layout_weight="1.5"
89
                android:background="@drawable/bg_lock_contact"
90
                android:layout_marginStart="10dp"
91
                android:id="@+id/tvContact"
92
                android:gravity="center"
93
                android:layout_marginTop="5dp"
94
                android:layout_width="0dp"
95
                android:layout_height="42dp"
96
                android:text="联系客服"
97
                android:textColor="@color/white"
98
                android:textSize="16sp"
99
                />
100
        </LinearLayout>
101
    </LinearLayout>
102
</LinearLayout>

+ 34 - 0
app/src/main/res/layout/item_lock.xml

@ -0,0 +1,34 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    xmlns:tools="http://schemas.android.com/tools"
5
    xmlns:app="http://schemas.android.com/apk/res-auto"
6
    tools:background="#f1f"
7
    android:background="#f1f1"
8
    android:layout_marginTop="5dp"
9
    android:layout_height="match_parent">
10
    <TextView
11
        android:id="@+id/tvStatus"
12
        android:gravity="center"
13
        app:layout_constraintTop_toTopOf="parent"
14
        app:layout_constraintEnd_toEndOf="parent"
15
        android:layout_width="29dp"
16
        android:layout_height="17dp"
17
        android:text="空闲"
18
        android:textColor="@color/white"
19
        android:textSize="12sp"
20
        />
21
22
    <TextView
23
        android:id="@+id/tvOrder"
24
        app:layout_constraintEnd_toEndOf="parent"
25
        app:layout_constraintStart_toStartOf="parent"
26
        app:layout_constraintBottom_toBottomOf="parent"
27
        app:layout_constraintTop_toTopOf="parent"
28
        android:layout_width="8dp"
29
        android:layout_height="22dp"
30
        android:text="1"
31
        android:textColor="@color/editcolor"
32
        android:textSize="16sp"
33
        />
34
</androidx.constraintlayout.widget.ConstraintLayout>

+ 34 - 13
app/src/main/res/layout/recommend_charging_station_item.xml

@ -211,20 +211,43 @@
211 211
                android:textSize="11dp" />
212 212
        </LinearLayout>
213 213
    </LinearLayout>
214
    <TextView
215
        android:ellipsize="end"
216
        android:lines="1"
217
        android:visibility="gone"
218
        android:id="@+id/parkingFee"
214
    <LinearLayout
215
        android:layout_marginBottom="5dp"
219 216
        android:layout_marginEnd="15dp"
220 217
        android:layout_marginTop="15dp"
221 218
        android:layout_marginStart="15dp"
222
        android:layout_width="wrap_content"
223
        android:layout_height="wrap_content"
224
        tools:text="停车费:以实际收费为准"
225
        android:textColor="@color/color_ffe32727"
226
        android:textSize="13sp"
227
        />
219
        android:layout_width="match_parent"
220
        android:layout_height="wrap_content">
221
        <TextView
222
            android:gravity="bottom"
223
            android:ellipsize="end"
224
            android:lines="1"
225
            tools:visibility="visible"
226
            android:visibility="gone"
227
            android:id="@+id/parkingFee"
228
            android:layout_width="0dp"
229
            android:layout_weight="1"
230
            android:layout_height="match_parent"
231
            tools:text="停车费:以实际收费为准"
232
            android:textColor="@color/color_ffe32727"
233
            android:textSize="13sp"
234
            />
235
236
        <TextView
237
            tools:visibility="visible"
238
            android:visibility="visible"
239
            android:id="@+id/tvLock"
240
            android:layout_gravity="end|bottom"
241
            android:gravity="center"
242
            android:layout_width="49dp"
243
            android:layout_height="24dp"
244
            android:text="降地锁"
245
            android:background="@drawable/bg_lock_recommend"
246
            android:textColor="@color/white"
247
            android:textSize="12sp"
248
            />
249
250
    </LinearLayout>
228 251
    <LinearLayout
229 252
        android:layout_width="match_parent"
230 253
        android:layout_height="wrap_content"
@ -236,7 +259,6 @@
236 259
            android:id="@+id/payment_method"
237 260
            android:layout_width="0dp"
238 261
            android:layout_height="wrap_content"
239
            android:layout_marginTop="20dp"
240 262
            android:layout_weight="1"
241 263
            android:ellipsize="end"
242 264
            android:lines="1"
@ -249,7 +271,6 @@
249 271
            android:id="@+id/recommend_nav"
250 272
            android:layout_width="50dp"
251 273
            android:layout_height="24dp"
252
            android:layout_marginTop="20dp"
253 274
            android:background="@drawable/recommend_btn_normal"
254 275
            android:text="导航"
255 276
            android:textColor="#83d287"

+ 2 - 0
app/src/main/res/values/styles.xml

@ -380,4 +380,6 @@
380 380
    <style name="SquareCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
381 381
        <item name="android:button">@drawable/bg_car_owner_check</item>
382 382
    </style>
383

384

383 385
</resources>