Browse Source

完成首页增加车主认证活动入口

hy 1 year ago
parent
commit
a0fb2d2be7

+ 17 - 0
app/src/main/java/com/electric/chargingpile/activity/CarOwnerCertificateActivity.java

7
7
8
import android.Manifest;
8
import android.Manifest;
9
import android.app.ProgressDialog;
9
import android.app.ProgressDialog;
10
import android.content.Context;
10
import android.content.Intent;
11
import android.content.Intent;
11
import android.graphics.Bitmap;
12
import android.graphics.Bitmap;
12
import android.graphics.BitmapFactory;
13
import android.graphics.BitmapFactory;
18
import android.text.Html;
19
import android.text.Html;
19
import android.text.TextUtils;
20
import android.text.TextUtils;
20
import android.util.Base64;
21
import android.util.Base64;
22
import android.util.SparseArray;
21
import android.view.View;
23
import android.view.View;
22
import android.view.WindowManager;
24
import android.view.WindowManager;
23
import android.widget.Button;
25
import android.widget.Button;
715
                Manifest.permission.CAMERA
717
                Manifest.permission.CAMERA
716
        );
718
        );
717
    }
719
    }
720
721
    public static void actionStart(Context context){
722
        context.startActivity(new Intent(context,CarOwnerCertificateActivity.class));
723
    }
724
    public static void actionStart(Context context,boolean edit,String data){
725
        Intent intent = new Intent(context, CarOwnerCertificateActivity.class);
726
        intent.putExtra("edit",edit);
727
        intent.putExtra("data",data);
728
        context.startActivity(intent);
729
    }
730
    public static void actionStart(Context context,boolean edit){
731
        Intent intent = new Intent(context, CarOwnerCertificateActivity.class);
732
        intent.putExtra("edit",edit);
733
        context.startActivity(intent);
734
    }
718
}
735
}

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

59
59
60
    private static final int RC_CAMERA_PERM = 123;
60
    private static final int RC_CAMERA_PERM = 123;
61
    private long exitTime = 0;
61
    private long exitTime = 0;
62
    private  final WebFragment mWebFragment = WebFragment.getInstance("https://www.baidu.com");
62
    private  final WebFragment mWebFragment = WebFragment.getInstance("https://cdz.evcharge.cc/html/action-center/");
63
63
64
    @Override
64
    @Override
65
    protected void onCreate(Bundle savedInstanceState) {
65
    protected void onCreate(Bundle savedInstanceState) {

+ 29 - 20
app/src/main/java/com/electric/chargingpile/activity/MainMapActivity.java

465
                            if (adfloat != null && !adfloat.equals("")) {
465
                            if (adfloat != null && !adfloat.equals("")) {
466
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
466
                                List<Adin> listAdfloat = JsonUtils.parseToObjectList(adfloat, Adin.class);
467
                                if (listAdfloat.size() > 0) {
467
                                if (listAdfloat.size() > 0) {
468
                                    loadAdfloatImg(listAdfloat.get(0));
468
//                                    loadAdfloatImg(listAdfloat.get(0));
469
                                }
469
                                }
470
                            }
470
                            }
471
471
926
        showPostDelayedDialog();
926
        showPostDelayedDialog();
927
        getSwitch();
927
        getSwitch();
928
        switchRecommend();
928
        switchRecommend();
929
        switchCar();
929
//        ConfirmOrderActivity.actionStart(this);
930
//        ConfirmOrderActivity.actionStart(this);
930
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
931
//        startActivity(new Intent(getApplication(), ChargingStatusActivity.class));
931
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
932
//        startActivity(new Intent(this, SkipUserInfoActivity.class));
1277
        }
1278
        }
1278
    }
1279
    }
1279
1280
1280
    private void loadAdfloatImg(Adin adin) {
1281
        adfloatUrl = adin.getUrl();
1282
        Glide.with(this).load(MainApplication.url + "/zhannew/uploadfile/" + adin.getIcon()).listener(new RequestListener<Drawable>() {
1283
            @Override
1284
            public boolean onLoadFailed(@Nullable GlideException e, Object model, Target<Drawable> target, boolean isFirstResource) {
1285
                second_hand_car.setVisibility(View.GONE);
1286
                return false;
1287
            }
1288
1289
            @Override
1290
            public boolean onResourceReady(Drawable resource, Object model, Target<Drawable> target, DataSource dataSource, boolean isFirstResource) {
1291
                second_hand_car.setVisibility(View.VISIBLE);
1292
                return false;
1293
            }
1294
        }).into(second_hand_car);
1295
    }
1296
1281
1297
    /**
1282
    /**
1298
     * 设置一些amap的属性
1283
     * 设置一些amap的属性
1743
        });
1728
        });
1744
    }
1729
    }
1745
1730
1731
    private void switchCar() {
1732
        String url = MainApplication.url + "/zhannew/basic/web/index.php/zhangonggao/switchcar";
1733
        OkHttpUtils.get().url(url)
1734
                .build().execute(new StringCallback() {
1735
            @Override
1736
            public void onError(Call call, Exception e) {
1737
                e.printStackTrace();
1738
            }
1739
1740
            @Override
1741
            public void onResponse(String response) {
1742
                String rtnCode = JsonUtils.getKeyResult(response, "code");
1743
                if ("100".equals(rtnCode)) {
1744
                    String data = JsonUtils.getKeyResult(response, "data");
1745
                    if (EmptyUtils.isNotEmpty(data) && data.equals("1")) {
1746
                        second_hand_car.setVisibility(View.VISIBLE);
1747
                    }else{
1748
                        second_hand_car.setVisibility(View.GONE);
1749
                    }
1750
                }else{
1751
                    second_hand_car.setVisibility(View.GONE);
1752
                }
1753
            }
1754
        });
1755
    }
1756
1746
    private void dealUpdateData(List<UpdateZhanDataBean> list) {
1757
    private void dealUpdateData(List<UpdateZhanDataBean> list) {
1747
        String dbPath = "/data/user/0/com.electric.chargingpile/databases/zhan_list";
1758
        String dbPath = "/data/user/0/com.electric.chargingpile/databases/zhan_list";
1748
        String uptime = "";
1759
        String uptime = "";
2438
                }
2449
                }
2439
                break;
2450
                break;
2440
            case R.id.second_hand_car:
2451
            case R.id.second_hand_car:
2441
                Intent adfloatIntent = new Intent(this, MyWebViewActivity.class);
2442
                adfloatIntent.putExtra("url", adfloatUrl);
2443
                startActivity(adfloatIntent);
2452
                CarOwnerCertificateActivity.actionStart(this);
2444
                break;
2453
                break;
2445
            case R.id.iv_roadCondition:
2454
            case R.id.iv_roadCondition:
2446
                MobclickAgent.onEvent(getApplicationContext(), "0113");
2455
                MobclickAgent.onEvent(getApplicationContext(), "0113");

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

102
    public static String firstPoint = "";
102
    public static String firstPoint = "";
103
    public static Boolean firstSsyd;
103
    public static Boolean firstSsyd;
104
    public static String password = "";
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
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
113
    public static String d1evUrl = "https://d1ev-new.yiduyongche.com";// 评论上传视频
114
    public static String CDN = "https://cdn-fs.d1ev.com";
114
    public static String CDN = "https://cdn-fs.d1ev.com";

BIN
app/src/main/res/drawable-xxhdpi/authentication.webp


+ 3 - 3
app/src/main/res/layout/activity_main_map.xml

1660
            <ImageView
1660
            <ImageView
1661
1661
1662
                android:id="@+id/second_hand_car"
1662
                android:id="@+id/second_hand_car"
1663
                android:layout_width="80dp"
1664
                android:layout_height="80dp"
1663
                android:layout_width="50dp"
1664
                android:layout_height="50dp"
1665
                android:layout_above="@+id/iv_route"
1665
                android:layout_above="@+id/iv_route"
1666
                android:layout_alignParentRight="true"
1666
                android:layout_alignParentRight="true"
1667
                android:layout_marginTop="30dp"
1667
                android:layout_marginTop="30dp"
1668
                android:layout_marginRight="15dp"
1668
                android:layout_marginRight="15dp"
1669
                android:layout_marginBottom="9dp"
1669
                android:layout_marginBottom="9dp"
1670
                android:visibility="gone"
1670
                android:visibility="gone"
1671
                tools:background="#ff0000"
1671
                android:src="@drawable/authentication"
1672
                tools:visibility="visible" />
1672
                tools:visibility="visible" />
1673
1673
1674
            <ImageView
1674
            <ImageView

+ 4 - 1
app/src/main/res/layout/activity_privacy_agreement.xml

56
    </ScrollView>
56
    </ScrollView>
57
57
58
    <LinearLayout
58
    <LinearLayout
59
        app:layout_constraintEnd_toEndOf="parent"
60
        app:layout_constraintStart_toStartOf="parent"
59
        android:id="@+id/bottom_btn"
61
        android:id="@+id/bottom_btn"
60
        android:layout_width="match_parent"
62
        android:layout_width="0dp"
61
        android:layout_height="wrap_content"
63
        android:layout_height="wrap_content"
62
        android:orientation="vertical"
64
        android:orientation="vertical"
63
        android:paddingLeft="20dp"
65
        android:paddingLeft="20dp"
67
        app:layout_constraintBottom_toBottomOf="parent">
69
        app:layout_constraintBottom_toBottomOf="parent">
68
70
69
        <TextView
71
        <TextView
72
70
            android:id="@+id/agree_enter_text_view"
73
            android:id="@+id/agree_enter_text_view"
71
            android:layout_width="match_parent"
74
            android:layout_width="match_parent"
72
            android:layout_height="wrap_content"
75
            android:layout_height="wrap_content"