Browse Source

Merge branch 'master' of https://gitee.com/dmc_qq/ywy_app2 into master

master
wq 2 years ago
parent
commit
05cdae3eaa

+ 5
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/ETCHandleActivity.java View File

@@ -3,6 +3,7 @@ package com.huntersun.vkyes.etcopencard.project.ui.activity;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
import android.widget.LinearLayout;
@@ -104,6 +105,10 @@ public class ETCHandleActivity extends AppActivity implements OnRefreshLoadMoreL
@Override
@SingleClick
public void onClick(View v) {
if(TextUtils.isEmpty(items.getIsValueCard())){
toast("无法获取卡类型");
return;
}
Bundle bundle = new Bundle();
bundle.putString("bizContent", JSON.toJSONString(items));
bundle.putString("orderId", getIntent().getStringExtra("orderId") + "");

+ 3
- 2
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/VehicleInformationActivity.java View File

@@ -114,7 +114,8 @@ public class VehicleInformationActivity extends AppActivity {
}
}

if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
//TODO 测试 update1
/* if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
toast("输入的车牌与上传的行驶证车牌不一致,请重新输入或者上传!");
return;
}
@@ -122,7 +123,7 @@ public class VehicleInformationActivity extends AppActivity {
if(!binding.text1.getText().toString().equals(getIntent().getStringExtra("vehiclePlate"))){
toast("申办车牌与识别出来的车牌不一致,请重新上传申办车牌的行驶证!");
return;
}
}*/

FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
fatherBean.bizContent = new SendTheVerificationCodeBean();

+ 386
- 370
app/src/main/res/layout/activity_information_confirmed.xml View File

@@ -1,429 +1,445 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">

<com.hjq.bar.TitleBar
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@drawable/video_ball_bg12"
app:leftIcon="@mipmap/back_three"
app:lineVisible="false"
app:titleColor="#FFFFFF" />
android:background="@color/background_color">

<com.huntersun.vkyes.etcopencard.src.widget.StatusLayout
android:id="@+id/hl_status_hint"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1">
android:layout_height="wrap_content">

<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="match_parent"
android:layout_above="@+id/rly_1">

<LinearLayout
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
android:layout_height="match_parent"
android:paddingBottom="@dimen/dp_30">

<LinearLayout
<ImageView
android:id="@+id/img_top_bg"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_180"
android:background="@mipmap/order_detail_top_bg" />

<TextView
android:id="@+id/tv_order_status"
style="@style/greenTextStyleBold20"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="left"
android:layout_alignTop="@+id/img_green_card"
android:layout_marginLeft="@dimen/dp_30"
android:layout_marginTop="@dimen/dp_12"
android:background="@color/white"
android:orientation="vertical"
android:padding="@dimen/dp_15">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<View
android:layout_width="3dp"
android:layout_height="16dp"
android:background="#00B38B" />

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="车辆信息" />

<TextView
android:id="@+id/update1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text="车辆信息修改"
android:textColor="#00B38B" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="车牌号"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text1"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="车牌颜色"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>
android:layout_toLeftOf="@+id/img_green_card"
android:text="请仔细确认信息" />

<ImageView
android:id="@+id/img_green_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignBottom="@+id/img_top_bg"
android:layout_alignParentRight="true"
android:layout_marginRight="@dimen/dp_47"
android:layout_marginBottom="@dimen/dp_29"
android:src="@mipmap/ic_order_detail_green_card" />

<!-- 车辆信息-->
<com.ruffian.library.widget.RLinearLayout
android:id="@+id/cardInfo"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/img_green_card"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="-24dp"
android:layout_marginRight="@dimen/dp_15"
android:orientation="vertical"
android:padding="@dimen/dp_10"
app:background_normal="@color/white"
app:corner_radius="@dimen/dp_10">
<!--车辆信息-->
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_5">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="收费车型"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text3"
android:layout_width="wrap_content"
android:orientation="horizontal">

<TextView
android:id="@+id/tv_yhhh_title"
style="@style/blackTextStyleBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/rlinear_ddxx"
android:layout_marginBottom="@dimen/dp_12"
android:text="车辆信息" />

<TextView
android:id="@+id/update1"
android:layout_width="0dp"
android:layout_weight="1"
android:gravity="right|center_vertical"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text="车辆信息修改"
android:textColor="#00B38B" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车牌号" />

<TextView
android:id="@+id/text1"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="核载人数"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text4"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车牌颜色" />

<TextView
android:id="@+id/text2"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:id="@+id/vehicle_information"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="收费车型" />

<TextView
android:id="@+id/text3"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="核定载质量"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text5"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="核载人数" />

<TextView
android:id="@+id/text4"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="核定载质量" />

<TextView
android:id="@+id/text5"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="车辆尺寸"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text6"
android:layout_width="wrap_content"
android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车辆尺寸" />

<TextView
android:id="@+id/text6"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

android:layout_marginTop="@dimen/dp_15"
android:orientation="horizontal">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="车轴数" />

<TextView
android:id="@+id/text10"
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>
</LinearLayout>
</com.ruffian.library.widget.RLinearLayout>

<LinearLayout
android:id="@+id/layout"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal"
android:visibility="gone"
tools:visibility="visible">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="车轴数"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

</LinearLayout>

<!-- 证件信息-->
<LinearLayout
android:id="@+id/certificates"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_12"
android:background="@color/white"
android:orientation="vertical"
android:padding="@dimen/dp_15">
android:layout_below="@+id/cardInfo"
android:orientation="vertical">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:layout_height="wrap_content"
android:paddingRight="@dimen/dp_30"
android:orientation="horizontal">

<View
android:layout_width="3dp"
android:layout_height="16dp"
android:background="#00B38B" />

<TextView
android:layout_width="0dp"
style="@style/blackTextStyleBold16"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:layout_below="@+id/rlinear_ddxx"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginTop="@dimen/dp_15"
android:layout_marginBottom="@dimen/dp_12"
android:text="证件信息" />

<TextView
android:id="@+id/update2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text="证件信息修改"
android:textColor="#00B38B" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="姓名"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text7"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="证件类型"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text8"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center_vertical|right"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

android:text="证件信息修改"
android:textColor="#00B38B" />
</LinearLayout>

<LinearLayout
<com.ruffian.library.widget.RLinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_below="@+id/tv_yhhh_title"
android:layout_marginLeft="@dimen/dp_15"
android:layout_marginRight="@dimen/dp_15"
android:orientation="vertical"
android:paddingLeft="@dimen/dp_10"
android:paddingTop="@dimen/dp_15"
android:paddingRight="@dimen/dp_10"
android:paddingBottom="@dimen/dp_15"
app:background_normal="@color/white"
app:corner_radius="@dimen/dp_10">

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="证件号"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text9"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="姓名" />

<TextView
android:id="@+id/text7"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_15"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="证件类型" />

<TextView
android:id="@+id/text8"
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="证件有效日期"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text11"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_15"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="证件号" />

<TextView
android:id="@+id/text9"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:gravity="center_vertical"
android:orientation="horizontal">

<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:layout_weight="1"
android:text="手机号"
android:textColor="#777777"
android:textSize="14sp" />

<TextView
android:id="@+id/text12"
android:layout_width="wrap_content"
android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_15"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="证件有效日期" />

<TextView
android:id="@+id/text11"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>

<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="@dimen/dp_8"
android:text=""
android:textColor="#333333" />

</LinearLayout>


android:orientation="horizontal"
android:layout_marginTop="@dimen/dp_15"
android:paddingLeft="@dimen/dp_5"
android:paddingRight="@dimen/dp_10">

<TextView
style="@style/black02TextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="手机号" />

<TextView
android:id="@+id/text12"
style="@style/blackTextStyle14"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="" />
</LinearLayout>
</com.ruffian.library.widget.RLinearLayout>
</LinearLayout>

</LinearLayout>

</RelativeLayout>
</androidx.core.widget.NestedScrollView>

</com.huntersun.vkyes.etcopencard.src.widget.StatusLayout>

<Button
android:id="@+id/nextStep"
android:layout_marginTop="@dimen/dp_30"
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/rly_1"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_45"
android:layout_marginHorizontal="@dimen/dp_112"
android:layout_marginBottom="@dimen/dp_20"
android:background="@drawable/button_circle_selector3"
android:text="下一步"
android:textColor="#FFFFFF" />
android:layout_alignParentBottom="true"
android:background="@color/white">

<com.ruffian.library.widget.RTextView
android:id="@+id/nextStep"
style="@style/whiteTextStyle12"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_30"
android:layout_marginRight="@dimen/dp_35"
android:gravity="center"
android:paddingLeft="@dimen/dp_15"
android:paddingRight="@dimen/dp_15"
android:text="下一步"
app:background_normal="@color/green01"
app:corner_radius="@dimen/dp_50"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>

<com.hjq.bar.TitleBar
android:id="@+id/title_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/transparent"
app:leftIcon="@mipmap/back_three"
app:lineVisible="false"
app:titleColor="@color/black"
/>

</LinearLayout>
</RelativeLayout>

Loading…
Cancel
Save