Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
539
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
539 540
                    Matcher matcher = pattern.matcher(ss);
540 541
                    while (matcher.find()) {
541 542
                        int start = matcher.start();

+ 3 - 2
app/src/main/java/com/electric/chargingpile/adapter/PingLunAdapter.java

@ -28,6 +28,7 @@ import com.electric.chargingpile.activity.SingleCommentActivity;
28 28
import com.electric.chargingpile.application.MainApplication;
29 29
import com.electric.chargingpile.util.NetUtil;
30 30
import com.electric.chargingpile.util.OkHttpUtil;
31
import com.electric.chargingpile.util.StringUtils;
31 32
import com.electric.chargingpile.util.Util;
32 33
import com.electric.chargingpile.view.CircleImageView;
33 34
import com.squareup.okhttp.Request;
@ -345,7 +346,7 @@ public class PingLunAdapter extends BaseAdapter {
345 346
                        "pcontent"));
346 347
347 348
//                SpannableString ss = new SpannableString("123#haode#");
348
                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
349
                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
349 350
                Matcher matcher = pattern.matcher(ss);
350 351
                while (matcher.find()) {
351 352
                    int start = matcher.start();
@ -454,7 +455,7 @@ public class PingLunAdapter extends BaseAdapter {
454 455
455 456
    public static boolean isTopic() {
456 457
//        String strPattern = "#[0-9a-zA-Z\\u4e00-\\u9fa5]+#";
457
        Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
458
        Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
458 459
        Matcher matcher = pattern.matcher("11111#haode#");
459 460
        System.out.println(matcher.matches() + "---");
460 461

+ 2 - 1
app/src/main/java/com/electric/chargingpile/adapter/ZhanCommentsAapter.java

@ -34,6 +34,7 @@ import com.electric.chargingpile.util.CarTypeUtil;
34 34
import com.electric.chargingpile.util.CircleTransform;
35 35
import com.electric.chargingpile.util.DES3;
36 36
import com.electric.chargingpile.util.JsonUtils;
37
import com.electric.chargingpile.util.StringUtils;
37 38
import com.electric.chargingpile.util.ToastUtil;
38 39
import com.electric.chargingpile.util.Util;
39 40
import com.squareup.picasso.Picasso;
@ -202,7 +203,7 @@ public class ZhanCommentsAapter extends BaseAdapter {
202 203
                } else {
203 204
                    holder.tv_pcontext.setVisibility(View.VISIBLE);
204 205
                    SpannableString ss = new SpannableString(content);
205
                    Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
206
                    Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
206 207
                    Matcher matcher = pattern.matcher(ss);
207 208
                    while (matcher.find()) {
208 209
                        int start = matcher.start();

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

@ -10,6 +10,10 @@ import android.os.StrictMode;
10 10
import android.text.TextUtils;
11 11
import android.util.Log;
12 12

13
import androidx.annotation.NonNull;
14
import androidx.camera.camera2.Camera2Config;
15

16
import androidx.camera.core.CameraXConfig;
13 17
import androidx.multidex.MultiDexApplication;
14 18

15 19
import com.alibaba.fastjson.JSONException;
@ -44,6 +48,8 @@ import com.tencent.bugly.crashreport.CrashReport;
44 48
import com.zhy.http.okhttp.OkHttpUtils;
45 49
import com.zhy.http.okhttp.callback.StringCallback;
46 50

51
import org.jetbrains.annotations.NotNull;
52

47 53
import java.io.BufferedReader;
48 54
import java.io.BufferedWriter;
49 55
import java.io.File;
@ -63,7 +69,7 @@ import okhttp3.Call;
63 69
import tv.danmaku.ijk.media.player.IjkMediaPlayer;
64 70

65 71

66
public class MainApplication extends MultiDexApplication {
72
public class MainApplication extends MultiDexApplication implements CameraXConfig.Provider{
67 73
    public static MainApplication instances;
68 74
    private DaoMaster.DevOpenHelper mHelper;
69 75
    private SQLiteDatabase db;
@ -418,6 +424,13 @@ public class MainApplication extends MultiDexApplication {
418 424
        CrashReport.initCrashReport(MainApplication.context, "900010422", BuildConfig.DEBUG);
419 425
        CrashReport.setAppChannel(MainApplication.context, BuildConfig.FLAVOR);
420 426
    }
427

428
    @NonNull
429
    @NotNull
430
    @Override
431
    public CameraXConfig getCameraXConfig() {
432
        return Camera2Config.defaultConfig();
433
    }
421 434
}
422 435

423 436


+ 2 - 1
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@ -63,6 +63,7 @@ import com.electric.chargingpile.util.JsonUtils;
63 63
import com.electric.chargingpile.util.LoadingDialog;
64 64
import com.electric.chargingpile.util.Md5Util;
65 65
import com.electric.chargingpile.util.OkHttpUtil;
66
import com.electric.chargingpile.util.StringUtils;
66 67
import com.electric.chargingpile.util.Util;
67 68
import com.electric.chargingpile.view.CircleImageView;
68 69
import com.electric.chargingpile.view.CustomProgressDialog;
@ -1308,7 +1309,7 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1308 1309
                            } else {
1309 1310
                                tv_pcontext.setVisibility(View.VISIBLE);
1310 1311
                                SpannableString ss = new SpannableString(content);
1311
                                Pattern pattern = Pattern.compile("#[0-9a-zA-Z,\\u4e00-\\u9fa5]+#");
1312
                                Pattern pattern = Pattern.compile(StringUtils.ThemeRegular);
1312 1313
                                Matcher matcher = pattern.matcher(ss);
1313 1314
                                while (matcher.find()) {
1314 1315
                                    int start = matcher.start();

+ 2 - 0
app/src/main/java/com/electric/chargingpile/util/StringUtils.java

@ -17,6 +17,8 @@ import java.util.regex.Pattern;
17 17
 */
18 18
public class StringUtils {
19 19
    private static final String TAG = "StringUtils";
20
    //话题 正则 匹配
21
    public static String ThemeRegular = "#[0-9a-zA-Z,~!@#$%^&*()+=|{}':;',\\\\[\\\\].<>/?~!@#¥%……&*()——+|{}【】‘;:”“’。, 、?\\u4e00-\\u9fa5]+#";
20 22
21 23
22 24
    /**

+ 1 - 1
app/src/main/java/com/electric/chargingpile/util/Util.java

@ -512,7 +512,7 @@ public class Util {
512 512
        // 相册文件夹列表选中圆点
513 513
        style.pictureFolderCheckedDotStyle = R.drawable.picture_orange_oval;
514 514
        // 相册返回箭头
515
        style.pictureLeftBackIcon = R.drawable.ic_back_arrow;
515
        style.pictureLeftBackIcon = R.drawable.ic_back_orange;
516 516
        // 标题栏字体颜色
517 517
        style.pictureTitleTextColor = ContextCompat.getColor(context, R.color.app_color_black);
518 518
        // 相册右侧取消按钮字体颜色  废弃 改用.pictureRightDefaultTextColor和.pictureRightDefaultTextColor

+ 19 - 5
app/src/main/java/com/electric/chargingpile/view/SignInDialog.java

@ -3,6 +3,7 @@ package com.electric.chargingpile.view;
3 3
import android.content.Context;
4 4
import android.text.Html;
5 5
import android.text.TextUtils;
6
import android.util.Log;
6 7
import android.view.Display;
7 8
import android.view.LayoutInflater;
8 9
import android.view.View;
@ -13,6 +14,8 @@ import android.widget.TextView;
13 14
14 15
import com.electric.chargingpile.R;
15 16
17
import static android.text.Html.FROM_HTML_MODE_LEGACY;
18
16 19
/**
17 20
 * Created by demon on 2017/5/26.
18 21
 */
@ -107,20 +110,31 @@ public class SignInDialog {
107 110
            tv_first.setText(first);
108 111
        }
109 112
113
114
        int intLogDay = Integer.parseInt(log_day);
115
        int i1 = intLogDay / 7;//获取倍数
116
        i1 = i1 * 7 ;
117
        if (i1 < intLogDay){
118
            i1 += 7;
119
        }
120
        int i2 = i1 - intLogDay; //差值
121
110 122
        if (score != null && !score.equals("")) {
111
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币"));
112
            int i = 7 - Integer.parseInt(log_day);
113
            if (i>=0){
114
                tv_2.setText("还有"+ i+"天获得充电优惠哦~");
123
            tv_num.setText(Html.fromHtml("今天签到获得 <font color='#01b637'>"+score+"</font> 个充电币", FROM_HTML_MODE_LEGACY));
124
125
            if ( i2 > 0 ){
126
                tv_2.setText("还有"+ i2 +"天获得充电优惠哦~");
115 127
            }
116 128
        } else {
117 129
            tv_num.setText("");
118 130
        }
119 131
120
        if (Integer.parseInt(log_day)>= 7){
132
        if (i2 == 0){
121 133
            tv_num.setText("充电订单折扣优惠券已到账");
122 134
            tv_2.setText("充电订单八折");
123 135
        }
136
137
124 138
        return this;
125 139
    }
126 140

BIN
app/src/main/res/drawable-xhdpi/ic_back_orange.png


+ 1 - 0
app/src/main/res/layout/item_zhancomments.xml

@ -125,6 +125,7 @@
125 125
126 126
127 127
        <TextView
128
            android:textColor="@color/color_1f1f1f"
128 129
            android:id="@+id/tv_pcontext"
129 130
            android:layout_width="wrap_content"
130 131
            android:layout_height="wrap_content"

+ 13 - 1
app/src/main/res/layout/item_zhanscomments.xml

@ -1,6 +1,7 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
3 3
    xmlns:app="http://schemas.android.com/apk/res-auto"
4
    xmlns:tools="http://schemas.android.com/tools"
4 5
    android:id="@+id/ll_out"
5 6
    android:layout_width="match_parent"
6 7
    android:layout_height="match_parent"
@ -14,6 +15,7 @@
14 15
        android:background="#fafafa">
15 16
16 17
        <com.electric.chargingpile.view.CircleImageView
18
            tools:visibility="visible"
17 19
            android:id="@+id/iv_icon_son"
18 20
            app:border_color="@color/white"
19 21
            android:layout_width="35dp"
@ -34,12 +36,13 @@
34 36
            android:layout_alignParentLeft="true"
35 37
            android:layout_gravity="center_vertical"
36 38
            android:layout_marginTop="12dp"
37
            android:text="EV200车主"
39
            android:text="EV200车主"   tools:visibility="visible"
38 40
            android:textAppearance="?android:attr/textAppearanceSmall"
39 41
            android:textColor="@color/ui_65"
40 42
            android:textSize="13sp" />
41 43
42 44
        <TextView
45
            tools:visibility="visible"
43 46
            android:id="@+id/tv_city_son"
44 47
            android:layout_width="wrap_content"
45 48
            android:layout_height="wrap_content"
@ -56,6 +59,8 @@
56 59
57 60
58 61
        <TextView
62
            android:textColor="@color/color_1f1f1f"
63
            tools:visibility="visible"
59 64
            android:id="@+id/tv_comment_son"
60 65
            android:layout_width="wrap_content"
61 66
            android:layout_height="wrap_content"
@ -71,6 +76,7 @@
71 76
72 77
73 78
        <TextView
79
            tools:visibility="visible"
74 80
            android:id="@+id/tv_time_son"
75 81
            android:layout_width="wrap_content"
76 82
            android:layout_height="wrap_content"
@ -84,6 +90,7 @@
84 90
            android:textSize="12sp" />
85 91
86 92
        <TextView
93
            tools:visibility="visible"
87 94
            android:id="@+id/tv_reply_son"
88 95
            android:layout_width="wrap_content"
89 96
            android:layout_height="wrap_content"
@ -97,6 +104,7 @@
97 104
98 105
99 106
        <TextView
107
            tools:visibility="visible"
100 108
            android:id="@+id/tv_childName_son"
101 109
            android:layout_width="wrap_content"
102 110
            android:layout_height="wrap_content"
@ -109,6 +117,7 @@
109 117
            android:visibility="gone" />
110 118
111 119
        <TextView
120
            tools:visibility="visible"
112 121
            android:id="@+id/textView15"
113 122
            android:layout_width="wrap_content"
114 123
            android:layout_height="wrap_content"
@ -121,6 +130,7 @@
121 130
            android:visibility="gone" />
122 131
123 132
        <TextView
133
            tools:visibility="visible"
124 134
            android:id="@+id/tv_parentName_son"
125 135
            android:layout_width="wrap_content"
126 136
            android:layout_height="wrap_content"
@ -133,6 +143,7 @@
133 143
            android:visibility="gone" />
134 144
135 145
        <TextView
146
            tools:visibility="visible"
136 147
            android:id="@+id/tv_commentDetail_son"
137 148
            android:layout_width="wrap_content"
138 149
            android:layout_height="wrap_content"
@ -145,6 +156,7 @@
145 156
            android:visibility="gone" />
146 157
147 158
        <View
159
            tools:visibility="visible"
148 160
            android:id="@+id/vvvv"
149 161
            android:layout_width="match_parent"
150 162
            android:layout_height="0.5dp"

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

@ -1,4 +1,5 @@
1 1
<?xml version="1.0" encoding="utf-8"?>
2 2
<resources>
3 3
    <color name="color_green_style1">#ff3ab948</color>
4
    <color name="color_1f1f1f">#1F1F1F</color>
4 5
</resources>

扫码充电图标更新 · b967a6bcb0 - Gogs: Go Git Service
浏览代码

扫码充电图标更新

huyuguo 4 年之前
父节点
当前提交
b967a6bcb0

+ 35 - 26
app/src/main/java/com/electric/chargingpile/activity/NewZhanDetailsActivity.java

@ -399,7 +399,12 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
399 399
        addDetailsFragment.setOnUpdateScanChargeFragmentListener(new DetailsFragment.OnDetailsFragmentListener() {
400 400
            @Override
401 401
            public void updateScanCharge(String ownPay) {
402
                rl_detail_scan.setVisibility("1".equals(ownPay) ? View.VISIBLE : View.GONE);
402
//                rl_detail_scan.setVisibility("1".equals(ownPay) ? View.VISIBLE : View.GONE);
403
            }
404
405
            @Override
406
            public void scanCharge() {
407
                scanChargeFunc();
403 408
            }
404 409
        });
405 410
        addZhanCommentFragment = new ZhanCommentFragment();
@ -849,31 +854,7 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
849 854
                break;
850 855
851 856
            case R.id.rl_detail_scan:
852
                MobclickAgent.onEvent(getApplicationContext(), "1124");
853
                if (!MainApplication.isLogin()) {
854
                    startActivity(new Intent(getApplication(), LoginActivity.class));
855
                } else if (!cameraTask()) {
856
                    EasyPermissions.requestPermissions(
857
                            this,
858
                            "该功能需要开启摄像头权限,是否前往开启?",
859
                            RC_CAMERA_PERM,
860
                            Manifest.permission.CAMERA);
861
                } else {
862
                    Intent iintent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
863
                    iintent.putExtra("url", MainApplication.url);
864
                    iintent.putExtra("user_id", MainApplication.userId);
865
                    iintent.putExtra("user_password", MainApplication.userPassword);
866
                    iintent.putExtra("user_phone", ProfileManager.getInstance().getUsername(getApplicationContext()));
867
                    LogUtils.e(ProfileManager.getInstance().getUsername(getApplicationContext()));
868
                    iintent.putExtra("cha", MainMapActivity.cha);
869
                    iintent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
870
                    startActivity(iintent);
871
                    overridePendingTransition(0, 0);
872
                    if (count == 1) {
873
                        MobclickAgent.onEvent(getApplicationContext(), "0104");
874
                        count = 2;
875
                    }
876
                }
857
                scanChargeFunc();
877 858
                break;
878 859
879 860
            case R.id.iv_share:
@ -939,6 +920,34 @@ public class NewZhanDetailsActivity extends AppCompatActivity implements View.On
939 920
        }
940 921
    }
941 922
923
    private void scanChargeFunc() {
924
        MobclickAgent.onEvent(getApplicationContext(), "1124");
925
        if (!MainApplication.isLogin()) {
926
            startActivity(new Intent(getApplication(), LoginActivity.class));
927
        } else if (!cameraTask()) {
928
            EasyPermissions.requestPermissions(
929
                    this,
930
                    "该功能需要开启摄像头权限,是否前往开启?",
931
                    RC_CAMERA_PERM,
932
                    Manifest.permission.CAMERA);
933
        } else {
934
            Intent iintent = new Intent(getApplicationContext(), com.google.zxing.client.android.CaptureActivity.class);
935
            iintent.putExtra("url", MainApplication.url);
936
            iintent.putExtra("user_id", MainApplication.userId);
937
            iintent.putExtra("user_password", MainApplication.userPassword);
938
            iintent.putExtra("user_phone", ProfileManager.getInstance().getUsername(getApplicationContext()));
939
            LogUtils.e(ProfileManager.getInstance().getUsername(getApplicationContext()));
940
            iintent.putExtra("cha", MainMapActivity.cha);
941
            iintent.setFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION);
942
            startActivity(iintent);
943
            overridePendingTransition(0, 0);
944
            if (count == 1) {
945
                MobclickAgent.onEvent(getApplicationContext(), "0104");
946
                count = 2;
947
            }
948
        }
949
    }
950
942 951
    @AfterPermissionGranted(RC_CAMERA_PERM)
943 952
    public boolean cameraTask() {
944 953
        if (hasCameraPermission()) {

+ 24 - 13
app/src/main/java/com/electric/chargingpile/fragment/DetailsFragment.java

@ -11,9 +11,6 @@ import android.os.Build;
11 11
import android.os.Bundle;
12 12
import android.os.Handler;
13 13
import android.os.Message;
14
15
import androidx.fragment.app.Fragment;
16
17 14
import android.text.SpannableString;
18 15
import android.text.Spanned;
19 16
import android.text.style.ForegroundColorSpan;
@ -25,9 +22,12 @@ import android.view.ViewTreeObserver;
25 22
import android.widget.ImageView;
26 23
import android.widget.LinearLayout;
27 24
import android.widget.RelativeLayout;
25
import android.widget.Space;
28 26
import android.widget.TextView;
29 27
import android.widget.Toast;
30 28
29
import androidx.fragment.app.Fragment;
30
31 31
import com.amap.api.maps.AMapUtils;
32 32
import com.amap.api.maps.model.LatLng;
33 33
import com.electric.chargingpile.R;
@ -44,16 +44,13 @@ import com.electric.chargingpile.data.MyOtto;
44 44
import com.electric.chargingpile.data.PileData;
45 45
import com.electric.chargingpile.data.RankinglistRefreshEvent;
46 46
import com.electric.chargingpile.data.Zhan;
47
import com.electric.chargingpile.util.CommonParams;
48 47
import com.electric.chargingpile.util.DES;
49 48
import com.electric.chargingpile.util.DES3;
50 49
import com.electric.chargingpile.util.DES3S;
51
import com.electric.chargingpile.util.DateUtils;
52 50
import com.electric.chargingpile.util.JsonUtils;
53 51
import com.electric.chargingpile.util.LoadingDialog;
54 52
import com.electric.chargingpile.util.Md5Util;
55 53
import com.electric.chargingpile.util.OkHttpUtil;
56
import com.electric.chargingpile.util.ToastUtil;
57 54
import com.electric.chargingpile.util.Util;
58 55
import com.electric.chargingpile.view.CircleImageView;
59 56
import com.electric.chargingpile.view.CustomProgressDialog;
@ -90,17 +87,12 @@ import java.io.BufferedWriter;
90 87
import java.io.InputStreamReader;
91 88
import java.io.OutputStreamWriter;
92 89
import java.io.PrintWriter;
93
import java.math.BigDecimal;
94 90
import java.net.Socket;
95 91
import java.net.URLEncoder;
96 92
import java.security.MessageDigest;
97
import java.text.SimpleDateFormat;
98 93
import java.util.ArrayList;
99 94
import java.util.Calendar;
100
import java.util.Date;
101
import java.util.HashMap;
102 95
import java.util.List;
103
import java.util.Map;
104 96
import java.util.regex.Matcher;
105 97
import java.util.regex.Pattern;
106 98
import java.util.regex.PatternSyntaxException;
@ -269,6 +261,15 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
269 261
                        if (detailsFragmentListener != null) {
270 262
                            detailsFragmentListener.updateScanCharge(own_pay);
271 263
                        }
264
265
                        if ("1".equals(own_pay)) {
266
                            scan_charge_btn.setVisibility(View.VISIBLE);
267
                            scan_charge_space.setVisibility(View.VISIBLE);
268
                        } else {
269
                            scan_charge_btn.setVisibility(View.GONE);
270
                            scan_charge_space.setVisibility(View.GONE);
271
                        }
272
272 273
                        String fenshi_info = JsonUtils.getKeyResult(info_decode, "fenshi_info");
273 274
                        String fenshi_is = JsonUtils.getKeyResult(info_decode, "fenshi_is");
274 275
@ -789,6 +790,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
789 790
        }
790 791
    };
791 792
    private String zongjia;
793
    private ImageView scan_charge_btn;
794
    private Space scan_charge_space;
792 795
793 796
    @Override
794 797
    public View onCreateView(LayoutInflater inflater, ViewGroup container,
@ -891,8 +894,6 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
891 894
        detail_zhan_pic = (ImageView) v.findViewById(R.id.detail_zhan_pic);
892 895
893 896
        detail_zhan_name = (AlignTextView) v.findViewById(R.id.detail_zhan_name);
894
//        chat_share_bar = v.findViewById(R.id.chat_share_bar);
895
//        chat_share_bar.setOnClickListener(this);
896 897
        red_paper_bag_top = v.findViewById(R.id.red_paper_bag_top);
897 898
        detail_grade = (TextView) v.findViewById(R.id.detail_grade);
898 899
        detail_picnum = (TextView) v.findViewById(R.id.detail_picnum);
@ -931,6 +932,9 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
931 932
        iv_new_icon = (CircleImageView) v.findViewById(R.id.iv_new_icon);
932 933
        ll_yunyingshang = (LinearLayout) v.findViewById(R.id.ll_yunyingshang);
933 934
        view_789 = v.findViewById(R.id.view_789);
935
        scan_charge_btn = v.findViewById(R.id.scan_charge_btn);
936
        scan_charge_btn.setOnClickListener(this);
937
        scan_charge_space = v.findViewById(R.id.scan_charge_space);
934 938
    }
935 939
936 940
    @Override
@ -969,6 +973,11 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
969 973
                MobclickAgent.onEvent(getActivity(), "0209");
970 974
                startActivity(new Intent(getActivity(), ChargingQianDaoActivity.class));
971 975
                break;
976
            case R.id.scan_charge_btn:
977
                if (detailsFragmentListener != null) {
978
                    detailsFragmentListener.scanCharge();
979
                }
980
                break;
972 981
        }
973 982
    }
974 983
@ -1501,6 +1510,8 @@ public class DetailsFragment extends Fragment implements View.OnClickListener, O
1501 1510
1502 1511
    public interface OnDetailsFragmentListener {
1503 1512
        void updateScanCharge(String ownPay);
1513
1514
        void scanCharge();
1504 1515
    }
1505 1516
1506 1517
    public void setOnUpdateScanChargeFragmentListener(OnDetailsFragmentListener listener) {

二进制
app/src/main/res/drawable-hdpi/scan_charge_btn.png


二进制
app/src/main/res/drawable-mdpi/scan_charge_btn.png


二进制
app/src/main/res/drawable-xhdpi/scan_charge_btn.png


二进制
app/src/main/res/drawable-xxhdpi/scan_charge_btn.png


二进制
app/src/main/res/drawable-xxxhdpi/scan_charge_btn.png


+ 18 - 0
app/src/main/res/layout/fragmen_details_new.xml

@ -827,6 +827,24 @@
827 827
828 828
            </RelativeLayout>
829 829
830
            <Space
831
                android:id="@+id/scan_charge_space"
832
                android:layout_width="match_parent"
833
                android:layout_height="110dp"
834
                android:visibility="gone"
835
                tools:visibility="visible" />
830 836
        </LinearLayout>
831 837
    </com.electric.chargingpile.view.CustomScrollView>
838
839
    <ImageView
840
        android:id="@+id/scan_charge_btn"
841
        android:layout_width="wrap_content"
842
        android:layout_height="wrap_content"
843
        android:layout_marginRight="15dp"
844
        android:layout_marginBottom="15dp"
845
        android:src="@drawable/scan_charge_btn"
846
        android:visibility="gone"
847
        app:layout_constraintBottom_toBottomOf="parent"
848
        app:layout_constraintRight_toRightOf="parent"
849
        tools:visibility="visible" />
832 850
</androidx.constraintlayout.widget.ConstraintLayout>