浏览代码

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

master
wq 2 年前
父节点
当前提交
d998d4e662

+ 17
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/ResultBean.java 查看文件

@@ -185,7 +185,24 @@ public class ResultBean<T> {
}
}

public static class ProductInfo{
public String id; //产品ID
public Long fee; //业务员端-产品价格
public String productMsg; //产品描述信息

@Override
public String toString() {
return "ProductInfo{" +
"id='" + id + '\'' +
", fee='" + fee + '\'' +
", productMsg='" + productMsg + '\'' +
'}';
}
}

public static class BizContent<T> {
public ProductInfo product; //产品额外信息
public String productId; //产品ID
private String appId = "52030131";
private boolean init;
private List<Products> products;

+ 8
- 4
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/HomeListInfo.java 查看文件

@@ -10,7 +10,6 @@ import android.view.View;
import android.widget.TextView;

import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.LogUtils;
import com.google.gson.Gson;
import com.huntersun.vky.obublelib.box.BoxManagers;
import com.huntersun.vkyes.etcopencard.databinding.ActivityHomeListInfoBinding;
@@ -199,10 +198,15 @@ public class HomeListInfo extends AppActivity implements StatusAction {
startActivity(intent);
break;
}
case "4": { //"完成签约。待支付"
// TODO 1、按照新逻辑-完成签约代表已经选择产品,所以这里不能跳转产品选择页,但是如果跳转到支付确认页面参数不全
case "4": { //"完成签约。待支付"-跳转到支付确认页面
ResultBean.BizContent productBean = new ResultBean.BizContent();
productBean.setId(bizContent1.productId);
productBean.setName(bizContent1.getProductName());
productBean.setProductMsg(bizContent1.product.productMsg);
productBean.setFee(bizContent1.product.fee);

Bundle bundle = new Bundle();
bundle.putString("bizContent", JSON.toJSONString(bizContent1));
bundle.putString("bizContent", JSON.toJSONString(productBean));
bundle.putString("orderId", bizContent1.getOrderId());
jumpToPage(ETCHandleSonActivity.class,bundle);


+ 24
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java 查看文件

@@ -13,9 +13,11 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

import com.blankj.utilcode.util.LogUtils;
import com.google.gson.Gson;
import com.hjq.http.model.FileContentResolver;
import com.hjq.permissions.Permission;
import com.huntersun.vky.obublelib.util.ValidatorUtils;
import com.huntersun.vkyes.etcopencard.R;
import com.huntersun.vkyes.etcopencard.databinding.ActivityIdentityInformationUploadBinding;
import com.huntersun.vkyes.etcopencard.project.api.Api;
@@ -63,7 +65,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
private String imgUrl3 = "";
private String imgUrl4 = "";
private String imgUrl5 = "";
private String identifyIdCard = ""; //识别出的身份证号
@Override
protected View getLayoutView() {
binding = ActivityIdentityInformationUploadBinding.inflate(getLayoutInflater());
@@ -169,6 +171,22 @@ public class IdentityInformationUploadActivity extends AppActivity {
return;
}
}

if(!ValidatorUtils.isMobile(binding.text2.getText().toString())){
toast("请输入正确的手机号!");
return;
}

if(!ValidatorUtils.isValidatedAllIdcard(binding.text3.getText().toString())){
toast("请输入有效的身份证号!");
return;
}

if(!binding.text3.getText().toString().equals(identifyIdCard)){
toast("输入身份证号与上传的身份证信息不匹配,请重新输入或上传!");
return;
}

FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
fatherBean.bizContent = new SendTheVerificationCodeBean();
fatherBean.bizContent.setOrderId(getIntent().getStringExtra("orderId")); //订单编号
@@ -401,9 +419,14 @@ public class IdentityInformationUploadActivity extends AppActivity {
destroy();
showDialog("证件信息识别中...");
RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE15, new Gson().toJson(fatherBean.bizContent));
String finalStr = str;
new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
@Override
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
if(finalStr.equals("1")){
identifyIdCard = bizContent1.getIdno();
}

hideDialog();
GlideApp.with(getActivity())
.load(mAvatarUrl)

+ 19
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/VehicleInformationActivity.java 查看文件

@@ -11,6 +11,8 @@ import android.view.View;
import android.widget.ImageView;
import android.widget.TextView;

import com.alibaba.fastjson.JSON;
import com.blankj.utilcode.util.LogUtils;
import com.google.gson.Gson;
import com.hjq.http.model.FileContentResolver;
import com.huntersun.vkyes.etcopencard.R;
@@ -62,6 +64,7 @@ public class VehicleInformationActivity extends AppActivity {
private String textValue; //车辆用户类型
private final StringBuilder mapKey = new StringBuilder(); //协议类型
List<EnumBean> list;
private String inputVehiclePlate = ""; //识别行驶证

@Override
protected View getLayoutView() {
@@ -110,6 +113,17 @@ public class VehicleInformationActivity extends AppActivity {
return;
}
}

if(!inputVehiclePlate.equals(binding.text1.getText().toString())){
toast("输入的车牌与上传的行驶证车牌不一致,请重新输入或者上传!");
return;
}

if(!binding.text1.getText().toString().equals(getIntent().getStringExtra("vehiclePlate"))){
toast("申办车牌与识别出来的车牌不一致,请重新上传申办车牌的行驶证!");
return;
}

FatherBean<SendTheVerificationCodeBean> fatherBean = new FatherBean<>();
fatherBean.bizContent = new SendTheVerificationCodeBean();
fatherBean.setFilename("CSMSN_ORDER_BASICVEHICLEUPLOAD_REQ_");
@@ -359,7 +373,7 @@ public class VehicleInformationActivity extends AppActivity {
fatherBean.setFilename("CSMSN_OCR_FILEUPLOAD_REQ_");
fatherBean.bizContent.setFileName(Math.random() + "_" + DateTimeFormatter.ofPattern("yyyyMMddHHmmss").toString());
fatherBean.bizContent.setFileBase64(QRCode.imageToBase64(data.get(0)));
Log.e("okhttp", "打印标题:" + new Gson().toJson(fatherBean));
Log.e(">>>>>>>>okhttp", "打印标题:" + new Gson().toJson(fatherBean));
destroy();
showDialog("图片文件上传中...");
RequestParameters parameters1 = new RequestParameters(IFCode.IFCODE17, new Gson().toJson(fatherBean.bizContent));
@@ -440,6 +454,10 @@ public class VehicleInformationActivity extends AppActivity {
new MyRetrofit().getRetrofit().create(Api.class).message2(parameters1).enqueue(new Converter<Result>() {
@Override
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent1) {
if(!TextUtils.isEmpty(bizContent1.getPlate_a())){
inputVehiclePlate = bizContent1.getPlate_a();
}

hideDialog();
GlideApp.with(getActivity())
.load(mAvatarUrl)

+ 516
- 0
library/obublelib/src/main/java/com/huntersun/vky/obublelib/util/ValidatorUtils.java 查看文件

@@ -0,0 +1,516 @@
package com.huntersun.vky.obublelib.util;

import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.Calendar;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.regex.Matcher;
import java.util.regex.Pattern;

/**
* Date :2023-03-12
* Description:正则校验
*/
public class ValidatorUtils {
/*
* 正则表达式:验证手机号
*/
private static final String REGEX_MOBILE = "^1[3|4|5|6|7|8][0-9]{9}$";

/*
* 正则表达式:验证邮箱
*/
private static final String REGEX_EMAIL = "\\w+([-+.]\\w+)*@\\w+([-.]\\w+)*\\.\\w+([-.]\\w+)*";//"^([a-z0-9A-Z]+[-|\\.]?)+[a-z0-9A-Z]@([a-z0-9A-Z]+(-[a-z0-9A-Z]+)?\\.)+[a-zA-Z]{2,}$";
/*
* 正则表达式:验证汉字
*/
private static final String REGEX_CHINESE = "^[\u4e00-\u9fa5]{2,10},*$";
/*
* 正则表达式:验证URL
*/
private static final String REGEX_URL = "http(s)?://([\\w-]+\\.)+[\\w-]+(/[\\w- ./?%&=]*)?";
/*
* 正则表达式:验证IP地址
*/
private static final String REGEX_IP_ADDR = "(25[0-5]|2[0-4]\\d|[0-1]\\d{2}|[1-9]?\\d)";

/*
* 禁止实例化.
*/
private ValidatorUtils() {
/* cannot be instantiated */
throw new UnsupportedOperationException("cannot be instantiated");
}

/*
* 校验手机号
*
* @param mobile
* @return 校验通过返回true,否则返回false
*/
public static boolean isMobile(String mobile) {
return Pattern.matches(REGEX_MOBILE, mobile);
}

/*
* 校验邮箱
*
* @param email
* @return 校验通过返回true,否则返回false
*/
public static boolean isEmail(String email) {
return Pattern.matches(REGEX_EMAIL, email);
}

/*
* 校验汉字
*
* @param chinese
* @return 校验通过返回true,否则返回false
*/
public static boolean isChinese(String chinese) {
return Pattern.matches(REGEX_CHINESE, chinese);
}

/*
* 校验URL
*
* @param url
* @return 校验通过返回true,否则返回false
*/
public static boolean isUrl(String url) {
return Pattern.matches(REGEX_URL, url);
}

/*
* 校验IP地址
*
* @param ipAddr
* @return
*/
public static boolean isIPAddr(String ipAddr) {
return Pattern.matches(REGEX_IP_ADDR, ipAddr);
}

/*
* 功能:判断字符串是否为数字
*
* @param str
* @return
*/
public static boolean isNumeric(String str) {
Pattern pattern = Pattern.compile("[0-9]*");
Matcher isNum = pattern.matcher(str);
return isNum.matches();
}

/*
* 功能:判断字符串是否为日期格式
*
* @param strDate
* @return
*/
public static boolean isDate(String strDate) {
Pattern pattern = Pattern
.compile("^((\\d{2}(([02468][048])|([13579][26]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])))))|(\\d{2}(([02468][1235679])|([13579][01345789]))[\\-\\/\\s]?((((0?[13578])|(1[02]))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(3[01])))|(((0?[469])|(11))[\\-\\/\\s]?((0?[1-9])|([1-2][0-9])|(30)))|(0?2[\\-\\/\\s]?((0?[1-9])|(1[0-9])|(2[0-8]))))))(\\s(((0?[0-9])|([1-2][0-3]))\\:([0-5]?[0-9])((\\s)|(\\:([0-5]?[0-9])))))?$");
Matcher m = pattern.matcher(strDate);
return m.matches();
}

/******************************身份证校验************************************/
/**
* 省,直辖市代码表: { 11:"北京",12:"天津",13:"河北",14:"山西",15:"内蒙古",
* 21:"辽宁",22:"吉林",23:"黑龙江",31:"上海",32:"江苏",
* 33:"浙江",34:"安徽",35:"福建",36:"江西",37:"山东",41:"河南",
* 42:"湖北",43:"湖南",44:"广东",45:"广西",46:"海南",50:"重庆",
* 51:"四川",52:"贵州",53:"云南",54:"西藏",61:"陕西",62:"甘肃",
* 63:"青海",64:"宁夏",65:"新疆",71:"台湾",81:"香港",82:"澳门",91:"国外"}
*/
protected static String codeAndCity[][] = { { "11", "北京" }, { "12", "天津" },
{ "13", "河北" }, { "14", "山西" }, { "15", "内蒙古" }, { "21", "辽宁" },
{ "22", "吉林" }, { "23", "黑龙江" }, { "31", "上海" }, { "32", "江苏" },
{ "33", "浙江" }, { "34", "安徽" }, { "35", "福建" }, { "36", "江西" },
{ "37", "山东" }, { "41", "河南" }, { "42", "湖北" }, { "43", "湖南" },
{ "44", "广东" }, { "45", "广西" }, { "46", "海南" }, { "50", "重庆" },
{ "51", "四川" }, { "52", "贵州" }, { "53", "云南" }, { "54", "西藏" },
{ "61", "陕西" }, { "62", "甘肃" }, { "63", "青海" }, { "64", "宁夏" },
{ "65", "新疆" }, { "71", "台湾" }, { "81", "香港" }, { "82", "澳门" },
{ "91", "国外" } };

private static String cityCode[] = { "11", "12", "13", "14", "15", "21", "22",
"23", "31", "32", "33", "34", "35", "36", "37", "41", "42", "43",
"44", "45", "46", "50", "51", "52", "53", "54", "61", "62", "63",
"64", "65", "71", "81", "82", "91" };

// 每位加权因子
private static int power[] = { 7, 9, 10, 5, 8, 4, 2, 1, 6, 3, 7, 9, 10, 5, 8, 4, 2 };

// 第18位校检码
private static String verifyCode[] = { "1", "0", "X", "9", "8", "7", "6", "5", "4", "3", "2" };

/*
* 验证所有的身份证的合法性
*
* @param idcard
* @return
*/
public static boolean isValidatedAllIdcard(String idcard) {
if (idcard.length() == 15) {
idcard = convertIdcarBy15bit(idcard);
}
return isValidate18Idcard(idcard);
}

/*
* <p>
* 判断18位身份证的合法性
* </p>
* 根据〖中华人民共和国国家标准GB11643-1999〗中有关公民身份号码的规定,公民身份号码是特征组合码,由十七位数字本体码和一位数字校验码组成。
* 排列顺序从左至右依次为:六位数字地址码,八位数字出生日期码,三位数字顺序码和一位数字校验码。
* <p>
* 顺序码: 表示在同一地址码所标识的区域范围内,对同年、同月、同 日出生的人编定的顺序号,顺序码的奇数分配给男性,偶数分配 给女性。
* </p>
* <p>
* 1.前1、2位数字表示:所在省份的代码; 2.第3、4位数字表示:所在城市的代码; 3.第5、6位数字表示:所在区县的代码;
* 4.第7~14位数字表示:出生年、月、日; 5.第15、16位数字表示:所在地的派出所的代码;
* 6.第17位数字表示性别:奇数表示男性,偶数表示女性;
* 7.第18位数字是校检码:也有的说是个人信息码,一般是随计算机的随机产生,用来检验身份证的正确性。校检码可以是0~9的数字,有时也用x表示。
* </p>
* <p>
* 第十八位数字(校验码)的计算方法为: 1.将前面的身份证号码17位数分别乘以不同的系数。从第一位到第十七位的系数分别为:7 9 10 5 8 4
* 2 1 6 3 7 9 10 5 8 4 2
* </p>
* <p>
* 2.将这17位数字和系数相乘的结果相加。
* </p>
* <p>
* 3.用加出来和除以11,看余数是多少?
* </p>
* 4.余数只可能有0 1 2 3 4 5 6 7 8 9 10这11个数字。其分别对应的最后一位身份证的号码为1 0 X 9 8 7 6 5 4 3
* 2。
* <p>
* 5.通过上面得知如果余数是2,就会在身份证的第18位数字上出现罗马数字的Ⅹ。如果余数是10,身份证的最后一位号码就是2。
* </p>
*
* @param idcard
* @return
*/
public static boolean isValidate18Idcard(String idcard) {
// 非18位为假
if (idcard.length() != 18) {
return false;
}
// 获取前17位
String idcard17 = idcard.substring(0, 17);
// 获取第18位
String idcard18Code = idcard.substring(17, 18);
char c[] = null;
String checkCode = "";
// 是否都为数字
if (isDigital(idcard17)) {
c = idcard17.toCharArray();
} else {
return false;
}

if (null != c) {
int bit[] = new int[idcard17.length()];

bit = converCharToInt(c);

int sum17 = 0;

sum17 = getPowerSum(bit);

// 将和值与11取模得到余数进行校验码判断
checkCode = getCheckCodeBySum(sum17);
if (null == checkCode) {
return false;
}
// 将身份证的第18位与算出来的校码进行匹配,不相等就为假
if (!idcard18Code.equalsIgnoreCase(checkCode)) {
return false;
}
}
return true;
}

/*
* 验证15位身份证的合法性,该方法验证不准确,最好是将15转为18位后再判断,该类中已提供。
*
* @param idcard
* @return
*/
public static boolean isValidate15Idcard(String idcard) {
// 非15位为假
if (idcard.length() != 15) {
return false;
}

// 是否全都为数字
if (isDigital(idcard)) {
String provinceid = idcard.substring(0, 2);
String birthday = idcard.substring(6, 12);
int year = Integer.parseInt(idcard.substring(6, 8));
int month = Integer.parseInt(idcard.substring(8, 10));
int day = Integer.parseInt(idcard.substring(10, 12));

// 判断是否为合法的省份
boolean flag = false;
for (String id : cityCode) {
if (id.equals(provinceid)) {
flag = true;
break;
}
}
if (!flag) {
return false;
}
// 该身份证生出日期在当前日期之后时为假
Date birthdate = null;
try {
birthdate = new SimpleDateFormat("yyMMdd").parse(birthday);
} catch (ParseException e) {
e.printStackTrace();
}
if (birthdate == null || new Date().before(birthdate)) {
return false;
}

// 判断是否为合法的年份
GregorianCalendar curDay = new GregorianCalendar();
int curYear = curDay.get(Calendar.YEAR);
int year2bit = Integer.parseInt(String.valueOf(curYear)
.substring(2));

// 判断该年份的两位表示法,小于50的和大于当前年份的,为假
if ((year < 50 && year > year2bit)) {
return false;
}

// 判断是否为合法的月份
if (month < 1 || month > 12) {
return false;
}

// 判断是否为合法的日期
boolean mflag = false;
curDay.setTime(birthdate); // 将该身份证的出生日期赋于对象curDay
switch (month) {
case 1:
case 3:
case 5:
case 7:
case 8:
case 10:
case 12:
mflag = (day >= 1 && day <= 31);
break;
case 2: // 公历的2月非闰年有28天,闰年的2月是29天。
if (curDay.isLeapYear(curDay.get(Calendar.YEAR))) {
mflag = (day >= 1 && day <= 29);
} else {
mflag = (day >= 1 && day <= 28);
}
break;
case 4:
case 6:
case 9:
case 11:
mflag = (day >= 1 && day <= 30);
break;
}
if (!mflag) {
return false;
}
} else {
return false;
}
return true;
}

/*
* 将15位的身份证转成18位身份证
*
* @param idcard
* @return
*/
public static String convertIdcarBy15bit(String idcard) {
String idcard17 = null;
// 非15位身份证
if (idcard.length() != 15) {
return null;
}

if (isDigital(idcard)) {
// 获取出生年月日
String birthday = idcard.substring(6, 12);
Date birthdate = null;
try {
birthdate = new SimpleDateFormat("yyMMdd").parse(birthday);
} catch (ParseException e) {
e.printStackTrace();
}
Calendar cday = Calendar.getInstance();
cday.setTime(birthdate);
String year = String.valueOf(cday.get(Calendar.YEAR));

idcard17 = idcard.substring(0, 6) + year + idcard.substring(8);

char c[] = idcard17.toCharArray();
String checkCode = "";

if (null != c) {
int bit[] = new int[idcard17.length()];

// 将字符数组转为整型数组
bit = converCharToInt(c);
int sum17 = 0;
sum17 = getPowerSum(bit);

// 获取和值与11取模得到余数进行校验码
checkCode = getCheckCodeBySum(sum17);
// 获取不到校验位
if (null == checkCode) {
return null;
}

// 将前17位与第18位校验码拼接
idcard17 += checkCode;
}
} else { // 身份证包含数字
return null;
}
return idcard17;
}

/*
* 15位和18位身份证号码的基本数字和位数验校
*
* @param idcard
* @return
*/
public static boolean isIdcard(String idcard) {
return idcard == null || "".equals(idcard) ? false : Pattern.matches("(^\\d{15}$)|(\\d{17}(?:\\d|x|X)$)", idcard);
}

/*
* 15位身份证号码的基本数字和位数验校
*
* @param idcard
* @return
*/
public static boolean is15Idcard(String idcard) {
return idcard == null || "".equals(idcard) ? false : Pattern.matches(
"^[1-9]\\d{7}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}$",
idcard);
}

/*
* 18位身份证号码的基本数字和位数验校
*
* @param idcard
* @return
*/
public static boolean is18Idcard(String idcard) {
return Pattern
.matches(
"^[1-9]\\d{5}[1-9]\\d{3}((0\\d)|(1[0-2]))(([0|1|2]\\d)|3[0-1])\\d{3}([\\d|x|X]{1})$",
idcard);
}

/*
* 数字验证
*
* @param str
* @return
*/
public static boolean isDigital(String str) {
return str == null || "".equals(str) ? false : str.matches("^[0-9]*$");
}

/*
* 将身份证的每位和对应位的加权因子相乘之后,再得到和值
*
* @param bit
* @return
*/
public static int getPowerSum(int[] bit) {
int sum = 0;
if (power.length != bit.length) {
return sum;
}
for (int i = 0; i < bit.length; i++) {
for (int j = 0; j < power.length; j++) {
if (i == j) {
sum = sum + bit[i] * power[j];
}
}
}
return sum;
}

/*
* 将和值与11取模得到余数进行校验码判断
*
* @param sum17
* @return 校验位
*/
public static String getCheckCodeBySum(int sum17) {
String checkCode = null;
switch (sum17 % 11) {
case 10:
checkCode = "2";
break;
case 9:
checkCode = "3";
break;
case 8:
checkCode = "4";
break;
case 7:
checkCode = "5";
break;
case 6:
checkCode = "6";
break;
case 5:
checkCode = "7";
break;
case 4:
checkCode = "8";
break;
case 3:
checkCode = "9";
break;
case 2:
checkCode = "x";
break;
case 1:
checkCode = "0";
break;
case 0:
checkCode = "1";
break;
}
return checkCode;
}

/*
* 将字符数组转为整型数组
*
* @param c
* @return
* @throws NumberFormatException
*/
public static int[] converCharToInt(char[] c) throws NumberFormatException {
int[] a = new int[c.length];
int k = 0;
for (char temp : c) {
a[k++] = Integer.parseInt(String.valueOf(temp));
}
return a;
}

}

正在加载...
取消
保存