- 0 app/src/main/java/com/electric/chargingpile/view/PreferentialDialog.java
Wyświetl plik
@ -0,0 +1,70 @@
1
package com.electric.chargingpile.view;
2
3
import android.os.Bundle;
4
import android.view.LayoutInflater;
5
import android.view.View;
6
import android.view.ViewGroup;
7
import android.widget.TextView;
8
9
import androidx.annotation.NonNull;
10
import androidx.annotation.Nullable;
11
import androidx.recyclerview.widget.LinearLayoutManager;
12
import androidx.recyclerview.widget.RecyclerView;
13
14
import com.electric.chargingpile.R;
15
import com.electric.chargingpile.adapter.PreferentialAdapter;
16
import com.google.android.material.bottomsheet.BottomSheetDialogFragment;
17
18
import org.jetbrains.annotations.NotNull;
19
/**
20
 * 选择优惠类型
21
 * */
22
public class PreferentialDialog extends BottomSheetDialogFragment {
23
24
    private RecyclerView recyclerView;
25
    private CompleteListener mListener;
26
27
    public static  PreferentialDialog newInstance(){
28
        PreferentialDialog dialog = new PreferentialDialog();
29
        Bundle arguments = dialog.getArguments();
30
        return dialog;
31
    }
32
33
34
    @Override
35
    public void onCreate(@Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
36
        super.onCreate(savedInstanceState);
37
        setStyle(BottomSheetDialogFragment.STYLE_NORMAL, R.style.TransparentVideoDialogFragmentTheme);
38
39
    }
40
41
    @Nullable
42
    @org.jetbrains.annotations.Nullable
43
    @Override
44
    public View onCreateView(@NonNull @NotNull LayoutInflater inflater, @Nullable @org.jetbrains.annotations.Nullable ViewGroup container, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
45
        View rootView=inflater.inflate(R.layout.dialog_preferential,container,false);
46
        return rootView;
47
    }
48
49
    @Override
50
    public void onViewCreated(@NonNull @NotNull View view, @Nullable @org.jetbrains.annotations.Nullable Bundle savedInstanceState) {
51
        super.onViewCreated(view, savedInstanceState);
52
        TextView complete=view.findViewById(R.id.complete);
53
        recyclerView = view.findViewById(R.id.recyclerView);
54
        recyclerView.setLayoutManager(new LinearLayoutManager(getActivity()));
55
        PreferentialAdapter adapter=new PreferentialAdapter();
56
        recyclerView.setAdapter(adapter);
57
        complete.setOnClickListener(v->{
58
            //获取adapter被选中的数据,并且返回回调给
59
            mListener.onComplete();
60
        });
61
    }
62
63
    public void setListener(CompleteListener listener){
64
        mListener=listener;
65
    }
66
67
    public interface CompleteListener{
68
        void onComplete();
69
    }
70
}

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


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


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


+ 5 - 0
app/src/main/res/drawable/bg_dialog_preferential.xml

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

+ 8 - 0
app/src/main/res/drawable/checkbox_style.xml

@ -0,0 +1,8 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3
4
    <item android:drawable="@drawable/ic_select_check" android:state_checked="true"/>
5
    <item android:drawable="@drawable/ic_no_check" android:state_checked="false"/>
6
    <item android:drawable="@drawable/ic_no_check"/>
7
8
</selector>

+ 4 - 0
app/src/main/res/layout/activity_oder_details.xml

@ -38,6 +38,7 @@
38 38
39 39
    </RelativeLayout>
40 40
41
41 42
    <LinearLayout
42 43
        android:id="@+id/ll_order"
43 44
        android:layout_width="match_parent"
@ -45,6 +46,9 @@
45 46
        android:layout_below="@+id/rl_title"
46 47
        android:layout_alignParentStart="true"
47 48
        android:layout_alignParentLeft="true"
49
        android:layout_marginStart="-1dp"
50
        android:layout_marginLeft="-1dp"
51
        android:layout_marginTop="0dp"
48 52
        android:background="@color/white"
49 53
        android:orientation="vertical">
50 54

+ 307 - 0
app/src/main/res/layout/activity_submit_orders.xml

@ -0,0 +1,307 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:background="@color/white"
5
    android:layout_height="match_parent">
6
    <RelativeLayout
7
        android:id="@+id/rl_title"
8
        android:layout_width="match_parent"
9
        android:layout_height="44dp"
10
        android:layout_alignParentStart="true"
11
        android:layout_alignParentLeft="true"
12
        android:layout_alignParentTop="true"
13
        android:background="@color/white">
14
15
        <TextView
16
            android:id="@+id/tv_zhan_name"
17
            android:layout_width="wrap_content"
18
            android:layout_height="wrap_content"
19
            android:layout_centerInParent="true"
20
            android:text="订单详情"
21
            android:textColor="@color/ui_62"
22
            android:textSize="18sp" />
23
24
        <ImageView
25
            android:id="@+id/iv_back"
26
            android:layout_width="wrap_content"
27
            android:layout_height="match_parent"
28
            android:layout_alignParentLeft="true"
29
            android:layout_centerVertical="true"
30
            android:contentDescription="@null"
31
            android:paddingLeft="15dp"
32
            android:paddingRight="15dp"
33
            android:src="@drawable/icon_lvback1119" />
34
35
    </RelativeLayout>
36
    <LinearLayout
37
        android:id="@+id/ll_order"
38
        android:layout_width="match_parent"
39
        android:layout_height="wrap_content"
40
        android:layout_below="@+id/rl_title"
41
        android:layout_alignParentStart="true"
42
        android:layout_alignParentLeft="true"
43
        android:layout_marginStart="-1dp"
44
        android:layout_marginLeft="-1dp"
45
        android:layout_marginTop="0dp"
46
        android:background="@color/white"
47
        android:orientation="vertical">
48
49
        <TextView
50
            android:id="@+id/tv_name"
51
            android:layout_width="wrap_content"
52
            android:layout_height="wrap_content"
53
            android:layout_gravity="center_horizontal"
54
            android:layout_marginTop="27dp"
55
            android:drawableLeft="@drawable/icon_zhan_name"
56
            android:drawablePadding="8dp"
57
            android:gravity="center"
58
            android:text=""
59
            android:textColor="@color/ui_62"
60
            android:textSize="18sp" />
61
62
        <TextView
63
            android:id="@+id/tv_charging_shifu"
64
            android:layout_width="wrap_content"
65
            android:layout_height="wrap_content"
66
            android:layout_gravity="center_horizontal"
67
            android:layout_marginTop="30dp"
68
            android:text="--"
69
            android:textColor="@color/ui_62"
70
            android:textSize="31sp" />
71
72
        <TextView
73
            android:layout_width="wrap_content"
74
            android:layout_height="wrap_content"
75
            android:layout_gravity="center_horizontal"
76
            android:layout_marginTop="14dp"
77
            android:text="实付金额(元)"
78
            android:textColor="@color/ui_68"
79
            android:textSize="14sp" />
80
81
        <RelativeLayout
82
            android:layout_width="match_parent"
83
            android:layout_height="wrap_content"
84
            android:layout_marginTop="21dp">
85
86
            <TextView
87
                android:layout_width="wrap_content"
88
                android:layout_height="wrap_content"
89
                android:layout_alignParentLeft="true"
90
                android:layout_marginLeft="15dp"
91
                android:text="充电费"
92
                android:textColor="@color/ui_62"
93
                android:textSize="14sp" />
94
95
            <TextView
96
                android:id="@+id/tv_charging_cost"
97
                android:layout_width="wrap_content"
98
                android:layout_height="wrap_content"
99
                android:layout_alignParentRight="true"
100
                android:layout_marginRight="15dp"
101
                android:text="--"
102
                android:textColor="@color/ui_62"
103
                android:textSize="14sp" />
104
105
        </RelativeLayout>
106
107
        <RelativeLayout
108
            android:layout_width="match_parent"
109
            android:layout_height="wrap_content"
110
            android:layout_marginTop="13dp">
111
112
            <TextView
113
                android:layout_width="wrap_content"
114
                android:layout_height="wrap_content"
115
                android:layout_alignParentLeft="true"
116
                android:layout_marginLeft="15dp"
117
                android:text="服务费"
118
                android:textColor="@color/ui_62"
119
                android:textSize="14sp" />
120
121
            <TextView
122
                android:id="@+id/tv_service_cost"
123
                android:layout_width="wrap_content"
124
                android:layout_height="wrap_content"
125
                android:layout_alignParentRight="true"
126
                android:layout_marginRight="15dp"
127
                android:text="--"
128
                android:textColor="@color/ui_62"
129
                android:textSize="14sp" />
130
131
        </RelativeLayout>
132
133
        <RelativeLayout
134
            android:id="@+id/layoutRed"
135
            android:layout_width="match_parent"
136
            android:layout_height="wrap_content"
137
            android:layout_marginTop="13dp">
138
139
            <TextView
140
                android:id="@+id/redEnvelope"
141
                android:layout_width="wrap_content"
142
                android:layout_height="wrap_content"
143
                android:layout_alignParentLeft="true"
144
                android:layout_marginLeft="15dp"
145
                android:text="红包/优惠券"
146
                android:textSize="14sp" />
147
            <ImageView
148
                android:layout_marginTop="8dp"
149
                android:layout_alignStart="@+id/redEnvelope"
150
                android:src="@drawable/ic_default_orders"
151
                android:layout_below="@+id/redEnvelope"
152
                android:layout_width="wrap_content"
153
                android:layout_height="wrap_content"/>
154
155
            <TextView
156
                android:layout_centerVertical="true"
157
                android:id="@+id/tv_charging_hongbao"
158
                android:layout_width="wrap_content"
159
                android:layout_height="wrap_content"
160
                android:layout_alignParentRight="true"
161
                android:layout_marginRight="15dp"
162
                android:text="--"
163
                android:textColor="@color/juhuang"
164
                android:textSize="14sp" />
165
166
        </RelativeLayout>
167
168
        <View
169
            android:layout_width="match_parent"
170
            android:layout_height="5dp"
171
            android:layout_marginTop="20dp"
172
            android:layout_marginBottom="20dp"
173
            android:background="#F6F6F6" />
174
175
        <RelativeLayout
176
            android:layout_width="match_parent"
177
            android:layout_height="wrap_content"
178
           >
179
180
            <TextView
181
                android:layout_width="wrap_content"
182
                android:layout_height="wrap_content"
183
                android:layout_alignParentLeft="true"
184
                android:layout_marginLeft="15dp"
185
                android:text="充电桩编号"
186
                android:textColor="@color/ui_68"
187
                android:textSize="14sp" />
188
189
            <TextView
190
                android:id="@+id/tv_zhuang_no"
191
                android:layout_width="wrap_content"
192
                android:layout_height="wrap_content"
193
                android:layout_alignParentRight="true"
194
                android:layout_marginRight="15dp"
195
                android:text="--"
196
                android:textColor="@color/ui_68"
197
                android:textSize="14sp" />
198
199
        </RelativeLayout>
200
201
        <RelativeLayout
202
            android:layout_width="match_parent"
203
            android:layout_height="wrap_content"
204
            android:layout_marginTop="13dp">
205
206
            <TextView
207
                android:layout_width="wrap_content"
208
                android:layout_height="wrap_content"
209
                android:layout_alignParentLeft="true"
210
                android:layout_marginLeft="15dp"
211
                android:text="充电时长"
212
                android:textColor="@color/ui_68"
213
                android:textSize="14sp" />
214
215
            <TextView
216
                android:id="@+id/tv_charging_time"
217
                android:layout_width="wrap_content"
218
                android:layout_height="wrap_content"
219
                android:layout_alignParentRight="true"
220
                android:layout_marginRight="15dp"
221
                android:text="--"
222
                android:textColor="@color/ui_68"
223
                android:textSize="14sp" />
224
225
        </RelativeLayout>
226
227
        <RelativeLayout
228
            android:layout_width="match_parent"
229
            android:layout_height="wrap_content"
230
            android:layout_marginTop="13dp">
231
232
            <TextView
233
                android:layout_width="wrap_content"
234
                android:layout_height="wrap_content"
235
                android:layout_alignParentLeft="true"
236
                android:layout_marginLeft="15dp"
237
                android:text="充电度数"
238
                android:textColor="@color/ui_68"
239
                android:textSize="14sp" />
240
241
            <TextView
242
                android:id="@+id/tv_charging_liang"
243
                android:layout_width="wrap_content"
244
                android:layout_height="wrap_content"
245
                android:layout_alignParentRight="true"
246
                android:layout_marginRight="15dp"
247
                android:text="--"
248
                android:textColor="@color/ui_68"
249
                android:textSize="14sp" />
250
251
        </RelativeLayout>
252
253
        <RelativeLayout
254
            android:id="@+id/rl_end_info"
255
            android:layout_width="match_parent"
256
            android:layout_height="wrap_content"
257
            android:layout_marginTop="13dp">
258
259
            <TextView
260
                android:layout_width="wrap_content"
261
                android:layout_height="wrap_content"
262
                android:layout_alignParentLeft="true"
263
                android:layout_marginLeft="15dp"
264
                android:text="结束原因"
265
                android:textColor="@color/ui_68"
266
                android:textSize="14sp" />
267
268
            <TextView
269
                android:id="@+id/tv_tishi"
270
                android:layout_width="wrap_content"
271
                android:layout_height="wrap_content"
272
                android:layout_alignParentRight="true"
273
                android:layout_marginRight="15dp"
274
                android:text="--"
275
                android:textColor="@color/ui_68"
276
                android:textSize="14sp" />
277
278
        </RelativeLayout>
279
    </LinearLayout>
280
281
    <TextView
282
        android:layout_centerHorizontal="true"
283
        android:layout_above="@+id/tv_gocomment"
284
        android:layout_width="wrap_content"
285
        android:layout_height="wrap_content"
286
        android:text="注:结束充电半小时没有提交结算订单系统默认按最大折扣结算"
287
        android:textColor="#ff707070"
288
        android:textSize="12sp"
289
        />
290
291
    <TextView
292
        android:id="@+id/tv_gocomment"
293
        android:layout_width="match_parent"
294
        android:layout_height="39dp"
295
        android:layout_alignParentBottom="true"
296
        android:layout_marginLeft="15dp"
297
        android:layout_marginTop="15dp"
298
        android:layout_marginRight="15dp"
299
        android:layout_marginBottom="7dp"
300
        android:background="@drawable/textview_greenstyle"
301
        android:gravity="center"
302
        android:text="提交订单并结算"
303
        android:textColor="@color/white"
304
        android:textSize="16sp" />
305
306
307
</RelativeLayout>

+ 45 - 0
app/src/main/res/layout/dialog_preferential.xml

@ -0,0 +1,45 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:orientation="vertical"
5
    android:background="@drawable/bg_dialog_preferential"
6
    android:layout_height="444dp">
7
8
    <TextView
9
        android:layout_marginBottom="15dp"
10
        android:layout_marginTop="20dp"
11
        android:layout_gravity="center_horizontal"
12
        android:layout_width="wrap_content"
13
        android:layout_height="wrap_content"
14
        android:text="优惠类型"
15
        android:textColor="#ff0e0e0e"
16
        android:textSize="18sp"
17
        />
18
    <androidx.recyclerview.widget.RecyclerView
19
        android:id="@+id/recyclerView"
20
        android:layout_width="match_parent"
21
        android:layout_height="320dp"/>
22
    <TextView
23
        android:visibility="gone"
24
        android:gravity="center"
25
        android:text="暂无优惠券~"
26
        android:textColor="#ff9b9b9b"
27
        android:textSize="18sp"
28
        android:id="@+id/noPreferential"
29
        android:layout_width="match_parent"
30
        android:layout_height="320dp"/>
31
    <TextView
32
        android:id="@+id/complete"
33
        android:layout_width="match_parent"
34
        android:layout_height="39dp"
35
        android:layout_marginLeft="12dp"
36
        android:layout_marginTop="15dp"
37
        android:layout_marginRight="12dp"
38
        android:layout_marginBottom="7dp"
39
        android:background="@drawable/textview_greenstyle"
40
        android:gravity="center"
41
        android:text="完成"
42
        android:textColor="@color/white"
43
        android:textSize="16sp" />
44
45
</LinearLayout>

+ 26 - 0
app/src/main/res/layout/item_text_checkbox.xml

@ -0,0 +1,26 @@
1
<?xml version="1.0" encoding="utf-8"?>
2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3
    android:layout_width="match_parent"
4
    android:padding="10dp"
5
    android:layout_height="wrap_content">
6
7
    <TextView
8
        android:layout_gravity="center"
9
        android:id="@+id/name"
10
        android:layout_weight="1"
11
        android:layout_width="0dp"
12
        android:layout_height="wrap_content"
13
        android:text="不使用"
14
        android:textColor="@color/color_ff333333"
15
        android:textSize="14sp" />
16
    <CheckBox
17
        android:layout_gravity="center"
18
        android:padding="5dp"
19
        style="@style/CustomCheckboxTheme"
20
        android:src="@drawable/ic_no_check"
21
        android:id="@+id/checkBox"
22
        android:layout_width="wrap_content"
23
        android:layout_height="wrap_content"
24
      />
25
26
</LinearLayout>

+ 1 - 0
app/src/main/res/values/color.xml

@ -198,6 +198,7 @@
198 198
    <color name="sv_white">#FFFFFF</color>
199 199
    <color name="color_3ec34c">#3EC34C</color>
200 200
    <color name="color_f08f4b">#F08F4B</color>
201
    <color name="color_ff333333">#ff333333</color>
201 202

202 203

203 204


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

@ -366,4 +366,15 @@
366 366
        <attr name="drawableBottomWidth" format="dimension" />
367 367
        <attr name="drawableBottomHeight" format="dimension" />
368 368
    </declare-styleable>
369

370
    <style name="TransparentVideoDialogFragmentTheme" parent="Theme.Design.Light.BottomSheetDialog">
371
        <item name="bottomSheetStyle">@style/CustomBottomSheetDialogFragmentStyle</item>
372

373
    </style>
374
    <style name="CustomBottomSheetDialogFragmentStyle" parent="Widget.Design.BottomSheet.Modal">
375
        <item name="android:background">@android:color/transparent</item>
376
    </style>
377
    <style name="CustomCheckboxTheme" parent="@android:style/Widget.CompoundButton.CheckBox">
378
        <item name="android:button">@drawable/checkbox_style</item>
379
    </style>
369 380
</resources>

关闭隐私协议,启动站点说明界面 · ae06683ab6 - Gogs: Go Git Service
Преглед на файлове

关闭隐私协议,启动站点说明界面

huyuguo преди 6 години
родител
ревизия
ae06683ab6

+ 5 - 18
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

@ -1199,24 +1199,6 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
1199 1199
                rl_ad.setVisibility(View.VISIBLE);
1200 1200
            }
1201 1201
        }
1202
        new Handler().postDelayed(new Runnable() {
1203
            @Override
1204
            public void run() {
1205
                SharedPreferencesUtil sharedPreferencesUtil = new SharedPreferencesUtil(getApplication());
1206
                if (!sharedPreferencesUtil.hasKey("cdz_private_protocol")) {
1207
                    return;
1208
                }
1209
1210
                if (MainApplication.isFirstExample == true) {
1211
1212
                    Intent intent_example = new Intent(getApplicationContext(), ExampleActivity.class);
1213
                    intent_example.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
1214
                    startActivity(intent_example);
1215
                    overridePendingTransition(0, 0);
1216
                }
1217
1218
            }
1219
        }, 5000);
1220 1202
1221 1203
        new Handler().postDelayed(new Runnable() {
1222 1204
            @Override
@ -3147,6 +3129,11 @@ public class MainMapActivity extends Activity implements LocationSource, AMapLoc
3147 3129
            case R.id.private_protocol_sure_and_go:
3148 3130
                sharedPreferencesUtil.putBoolean("cdz_private_protocol", true);
3149 3131
                rl_privacy_protocol.setVisibility(View.GONE);
3132
3133
                Intent pIntent = new Intent(getApplicationContext(), ExampleActivity.class);
3134
                pIntent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
3135
                startActivity(pIntent);
3136
                overridePendingTransition(0, 0);
3150 3137
                break;
3151 3138
            case R.id.private_protocol_web:
3152 3139
                intent = new Intent(getApplication(), IntegralDescriptionActivity.class);

+ 0 - 3
app/src/main/java/com/electric/chargingpile/activity/WelcomeActivity.java

@ -343,7 +343,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
343 343
            saveTask();
344 344
        } else {
345 345

346
            MainApplication.isFirstExample = true;
347 346
            cameraTask();
348 347
            androidd.setVisibility(View.GONE);
349 348
            ll_1.setVisibility(View.GONE);
@ -831,7 +830,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
831 830
        LogUtils.e("onPermissionsGranted");
832 831
        for (String s : perms) {
833 832
            if (s.equals(Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
834
                MainApplication.isFirstExample = false;
835 833
                new Handler().postDelayed(new Runnable() {
836 834
                    @Override
837 835
                    public void run() {
@ -890,7 +888,6 @@ public class WelcomeActivity extends Activity implements OnClickListener, EasyPe
890 888
    @AfterPermissionGranted(RC_SAVE_PERM)
891 889
    public void saveTask() {
892 890
        if (isSavePermissionOK()) {
893
            MainApplication.isFirstExample = false;
894 891
            new Handler().postDelayed(new Runnable() {
895 892
                @Override
896 893
                public void run() {

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

@ -126,7 +126,6 @@ public class MainApplication extends MultiDexApplication {
126 126
    public static String storePath = Environment.getExternalStorageDirectory().getAbsolutePath() + File.separator + "cdz_android";
127 127
    public static String q_content = "";
128 128
    public static Map<String, String> q_map = new HashMap<>();
129
    public static boolean isFirstExample;
130 129
    public static boolean isAppStart;
131 130
    public static boolean haveActivity = false;
132 131
    public static String ad_major = "";