qiubinghui
/
zhywpt-app
Следить 1
В избранное 0
Форкнуть 0
Код Задачи 0 Pull Request'ы 0 Релизы 0 Вики Активность
Просмотр исходного кода

登录改造

GZBranch
lujin 2 месяцев назад
Родитель
4487b7205c
Сommit
29499b46d2
11 измененных файлов: 203 добавлений и 115 удалений
Разделённый вид Показать статистику Diff
  1. 3
    3
      app/release/output-metadata.json
  2. 1
    1
      app/src/main/AndroidManifest.xml
  3. 6
    2
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/Api.java
  4. 1
    1
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java
  5. 17
    8
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java
  6. 98
    65
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java
  7. 10
    3
      app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeFour.java
  8. 1
    0
      app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/LoginActivity.java
  9. 1
    1
      app/src/main/res/layout-v2/fragment_home_four.xml
  10. 63
    29
      app/src/main/res/layout/activity_identity_information_upload.xml
  11. 2
    2
      common.gradle

+ 3
- 3
app/release/output-metadata.json Просмотреть файл

@@ -10,9 +10,9 @@
{
"type": "SINGLE",
"filters": [],
"versionCode": 11,
"versionName": "1.3.4",
"outputFile": "jz_app_v1.3.4_release_0519.apk"
"versionCode": 12,
"versionName": "1.3.5",
"outputFile": "jz_app_v1.3.5_release_0603.apk"
}
]
}

+ 1
- 1
app/src/main/AndroidManifest.xml Просмотреть файл

@@ -1139,7 +1139,7 @@
<intent-filter>
<action android:name="cn.jpush.android.intent.RECEIVE_MESSAGE" />
<category android:name="您应用的包名" />
<category android:name="com.huntersun.vkyes.etcopencard" />
</intent-filter>
</receiver>
</application>

+ 6
- 2
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/Api.java Просмотреть файл

@@ -43,10 +43,14 @@ public interface Api {
Call<Result> messageYd(@Body YdRequestParameters parameters);//异地测试环境

@POST("/ndev/")
Call<Result> message2GZ(@Body LinkedTreeMap<String,Object> params);//测试
Call<Result> message2GZ(@Body LinkedTreeMap<String,Object> params);//线上测试

@POST("/prod/")
Call<Result> message3GZ(@Body LinkedTreeMap<String,Object> params);//生产
Call<Result> message3GZ(@Body LinkedTreeMap<String,Object> params);//线上生产

@POST("/newDev/ndev/")
Call<Result> messageTJGZ(@Body LinkedTreeMap<String,Object> params);//太极改造



}

+ 1
- 1
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/MyRetrofit.java Просмотреть файл

@@ -266,7 +266,7 @@ public class MyRetrofit implements ToastAction {
//加密
// parameters.setBizContent(SM4Utils.encryptCBC(parameters.getBizContent(), SM4_KEY));
new MyRetrofit().getRetrofitGZ(code).create(Api.class)
.message2GZ(linkedTreeMap)
.messageTJGZ(linkedTreeMap)
.enqueue(new ConverterGZ<Result>(context, start, false, loadHint) {
@Override
protected void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

+ 17
- 8
app/src/main/java/com/huntersun/vkyes/etcopencard/project/api/bean/IFCode.java Просмотреть файл

@@ -25,7 +25,7 @@ public class IFCode {
public static final Map<String, String> LoadingMsgMap = new HashMap<String, String>();
static {
LoadingMsgMap.put(IFCode.IFCODE2, "发送中...");
LoadingMsgMap.put(IFCode.IFCODE4, "登录中...");
LoadingMsgMap.put(IFCode.IFCODE1004, "登录中...");
LoadingMsgMap.put(IFCode.IFCODE5, "登录中...");
LoadingMsgMap.put(IFCode.IFCODE6, "创建订单中...");
LoadingMsgMap.put(IFCode.IFCODE7, "取消订单中...");
@@ -64,16 +64,27 @@ public class IFCode {
LoadingMsgMap.put(IFCode.IFCODE520, "用户信息更改中...");
}

public static final String IFCODE2 = "iaw/message/sendMessage"; //统一会员平台发送验证码接口
/**
* 登录相关
*/
public static final String IFCODE1004 = "iaw/portal/login"; //统一门户账号密码登录
public static final String IFCODE1005 = "iaw/portal/loginByCode"; //统一门户手机号验证码登录
public static final String IFCODE1006 = "iaw/portal/loginConfirm"; //登录确认（获取Access-Token）
public static final String IFCODE_LOGINOUT = "iaw/portal/logout"; //退出登录
/**
* 验证码相关
*/
public static final String IFCODE2 = "iaw/portal/sendCode"; //获取验证码 //businessType 0-登录 1-注册 2-忘记密码 3-修改手机号
// public static final String IFCODE2 = "iaw/message/sendMessage"; //统一会员平台发送验证码接口


public static final String IFCODE_ETC_SENDCODE = "iaw/aftersale/customerInfoChange/etcMobileSmsCode"; //ETC预留手机号发送短信
public static final String IFCODE_ETC_SENDCODE2 = "iaw/aftersale/etcMobileChange/etcMobileChangeSmsCode"; //ETC预留手机号发送短信
public static final String IFCODE_ETC_SENDCODE_NEWPHONE = "iaw/aftersale/etcMobileChange/newMobileSmsCode"; //ETC新手机号发送短信
public static final String IFCODE_ETC_NEWPHONE_CHECK = "iaw/aftersale/etcMobileChange/mobileChangeProfile"; //资料上传
public static final String IFCODE_ETC_NEWPHONE_CHECK2 = "iaw/aftersale/etcMobileChange/newMobileSmsCodeValid"; //新手机号验证
public static final String IFCODE94 = "iaw/portal/changePassword"; //8.8.统一会员平台个人账号修改密码以旧换新接口
public static final String IFCODE4 = "4"; //登录
public static final String IFCODE55 = "55"; //手机号验证码登录
public static final String IFCODE66 = "66"; //登录

public static final String IFCODE5 = "5"; //通过code换取appid
public static final String IFCODE6 = "iaw/issue/order/add"; //创建订单
public static final String IFCODE7 = "iaw/issue/order/orderCancel"; //取消订单
@@ -211,9 +222,7 @@ public class IFCode {
public static final String IFCODE914 = "914"; //下单-订单产品选择
public static final String IFCODE_PRODUCT_COMMIT = "198172b1858d474fa8e35225d65014d7"; //下单-订单产品选择
public static final String IFCODE1032 = "iaw/rbac/menuListBySystemType"; //返回工作台菜单列表
public static final String IFCODE1004 = "iaw/portal/login"; //统一门户账号密码登录
public static final String IFCODE1005 = "iaw/portal/loginByCode"; //统一门户手机号验证码登录
public static final String IFCODE1006 = "iaw/portal/loginConfirm"; //登录确认（获取Access-Token）

public static final String IFCODETOKEN = "2b9345f4bf234719ab6830c94e7e2a6f"; //异地 Token）
public static final String IFCODE1009 = "iaw/portal/changePasswordByCode"; //修改密码
public static final String IFCODE_ACTIVE_OBUIMG = "iaw/issue/order/activeImgUpload"; //设备激活照片上传

+ 98
- 65
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/activity/IdentityInformationUploadActivity.java Просмотреть файл

@@ -34,10 +34,12 @@ import com.huntersun.vkyes.etcopencard.project.api.FatherBean;
import com.huntersun.vkyes.etcopencard.project.api.MyRetrofit;
import com.huntersun.vkyes.etcopencard.project.api.RequestParameters;
import com.huntersun.vkyes.etcopencard.project.api.Result;
import com.huntersun.vkyes.etcopencard.project.api.bean.EnumBean;
import com.huntersun.vkyes.etcopencard.project.api.bean.IFCode;
import com.huntersun.vkyes.etcopencard.project.api.bean.ResultBean;
import com.huntersun.vkyes.etcopencard.project.api.bean.SendTheVerificationCodeBean;
import com.huntersun.vkyes.etcopencard.project.api.sm4.SM4Utils;
import com.huntersun.vkyes.etcopencard.project.dialog.EnumListDialog;
import com.huntersun.vkyes.etcopencard.project.ocr.CameraActivity;
import com.huntersun.vkyes.etcopencard.project.ocr.FileUtil;
import com.huntersun.vkyes.etcopencard.project.tool.FileSizeUtil;
@@ -98,6 +100,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
private String address = "";//营业执照地址
private String gender = "";
private String identifyIdCard = ""; //识别出的身份证号
private String ownerIdType = "101";//车主证件类型
private ResultBean.BizContent biz;
private String file1;
private boolean isAgent = false;//是否本人办理 false本人 true经办人办理
@@ -260,6 +263,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
binding.text5.setOnClickListener(this);
binding.text8.setOnClickListener(this);
binding.text15.setOnClickListener(this);
binding.textZjlx.setOnClickListener(this);
binding.image1.setOnClickListener(this::onImage);
binding.image2.setOnClickListener(this::onImage);
binding.image3.setOnClickListener(this::onImage);
@@ -275,37 +279,37 @@ public class IdentityInformationUploadActivity extends AppActivity {
@SingleClick
public void onClick(View v) {
if ("PERSONAL_USER".equals(getIntent().getStringExtra("userType")) || "1".equals(getIntent().getStringExtra("userType"))) {
if (isSky(imgUrl1, "车主身份证正面", binding.image1) || isSky(imgUrl2, "车主身份证反面", binding.image2) ||
isSky(binding.text1.getText() + "", "车主姓名", binding.text1) ||
isSky(binding.text2.getText() + "", "车主手机号码", binding.text2) ||
isSky(binding.text3.getText() + "", "车主证件号", binding.text3) ||
isSky(binding.text4.getText() + "", "车主地址", binding.text4) ||
isSky(binding.text5.getText() + "", "车主身份证过期时间", binding.text5)) {
if (isSky(imgUrl1, "办理人身份证正面", binding.image1) || isSky(imgUrl2, "办理人身份证反面", binding.image2) ||
isSky(binding.text1.getText() + "", "办理人姓名", binding.text1) ||
isSky(binding.text2.getText() + "", "办理人手机号码", binding.text2) ||
isSky(binding.text3.getText() + "", "办理人证件号", binding.text3) ||
isSky(binding.text4.getText() + "", "办理人地址", binding.text4) ||
isSky(binding.text5.getText() + "", "办理人身份证过期时间", binding.text5)) {
return;
}
if (binding.layout2.getVisibility() == View.VISIBLE) {
if ("ENABLE".equals(MyShared.getInstance().get(MyShared.OTHERUPLOADPROXY, "").toString())) {
if (isSky(imgUrl3, "经办人身份证正面", binding.image3) || isSky(imgUrl4, "经办人身份证反面", binding.image4) ||
if (isSky(imgUrl3, "车主证件正面", binding.image3) || isSky(imgUrl4, "车主证件反面", binding.image4) ||
isSky(imgUrl5, "委托书图片", binding.image5) ||
isSky(binding.text6.getText() + "", "经办人姓名", binding.text6) ||
isSky(binding.text9.getText() + "", "经办人电话", binding.text9) ||
isSky(binding.text7.getText() + "", "经办人证件号", binding.text7) ||
isSky(binding.textAddress.getText() + "", "经办人地址", binding.textAddress) ||
isSky(binding.text8.getText() + "", "经办人身份证过期时间", binding.text8)) {
isSky(binding.text6.getText() + "", "车主姓名", binding.text6) ||
isSky(binding.text9.getText() + "", "车主电话", binding.text9) ||
isSky(binding.text7.getText() + "", "车主证件号", binding.text7) ||
isSky(binding.textAddress.getText() + "", "车主地址", binding.textAddress) ||
ownerIdType.equals("101") && isSky(binding.text8.getText() + "", "车主证件过期时间", binding.text8)) {
return;
}
} else {
if (isSky(imgUrl3, "经办人身份证正面", binding.image3) || isSky(imgUrl4, "经办人身份证反面", binding.image4) ||
isSky(binding.text6.getText() + "", "经办人姓名", binding.text6) ||
isSky(binding.text9.getText() + "", "经办人电话", binding.text9) ||
isSky(binding.textAddress.getText() + "", "经办人地址", binding.textAddress) ||
isSky(binding.text7.getText() + "", "经办人证件号", binding.text7) ||
isSky(binding.text8.getText() + "", "经办人身份证过期时间", binding.text8)) {
if (isSky(imgUrl3, "车主证件正面", binding.image3) || isSky(imgUrl4, "车主证件反面", binding.image4) ||
isSky(binding.text6.getText() + "", "车主姓名", binding.text6) ||
isSky(binding.text9.getText() + "", "车主电话", binding.text9) ||
isSky(binding.textAddress.getText() + "", "车主地址", binding.textAddress) ||
isSky(binding.text7.getText() + "", "车主证件号", binding.text7) ||
ownerIdType.equals("101") && isSky(binding.text8.getText() + "", "车主证件过期时间", binding.text8)) {
return;
}
}
if (!ValidatorUtils.isChinese(binding.text6.getText().toString())) {
toast("请输入正确的经办人姓名");
toast("请输入正确的车主姓名");
return;
}
}
@@ -338,17 +342,17 @@ public class IdentityInformationUploadActivity extends AppActivity {
fatherBean.bizContent.setTel(binding.text2.getText() + ""); //开户人手机号码
fatherBean.bizContent.setAddress(binding.text4.getText() + ""); //开户人地址

fatherBean.bizContent.setAgentIdType("101"); //经办人证件类型
fatherBean.bizContent.setAgentIdNum(binding.text7.getText() + ""); //经办人证件号码
fatherBean.bizContent.setAgentName(binding.text6.getText() + ""); //经办人姓名
fatherBean.bizContent.setAgentTel(binding.text9.getText() + ""); //经办人电话
fatherBean.bizContent.setAgentIdVld(binding.text8.getText() + ""); //经办人证件有效期
fatherBean.bizContent.setAgentPosImgUrl(imgUrl3); //经办人正面图片地址
fatherBean.bizContent.setAgentNegImgUrl(imgUrl4); //经办人反面图片地址
fatherBean.bizContent.setAgentIdType(ownerIdType); //车主证件类型
fatherBean.bizContent.setAgentIdNum(binding.text7.getText() + ""); //车主证件号码
fatherBean.bizContent.setAgentName(binding.text6.getText() + ""); //车主姓名
fatherBean.bizContent.setAgentTel(binding.text9.getText() + ""); //车主电话
fatherBean.bizContent.setAgentIdVld(binding.text8.getText() + ""); //车主证件有效期
fatherBean.bizContent.setAgentPosImgUrl(imgUrl3); //车主正面图片地址
fatherBean.bizContent.setAgentNegImgUrl(imgUrl4); //车主反面图片地址
fatherBean.bizContent.setProxyUrl(imgUrl5); //委托书图片地址
fatherBean.bizContent.setAgentAddress(binding.textAddress.getText().toString());//经办人地址
fatherBean.bizContent.setChannelId(MyShared.getInstance().get(MyShared.CHANNELID, "").toString()); //开户渠道编号(工号)
String ifcode = IFCode.IFCODE20;
String ifcode = IFCode.IFCODE20;
destroy();
binding.nextStep.setEnabled(false);
//提交个人信息或更新用户信息
@@ -444,6 +448,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
}
finish();
}

@Override
public void onError(Result resp) {
MyRetrofit.ReturnResult.super.onError(resp);
@@ -475,7 +480,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
params.put("agentIdType", "101");
params.put("loginSource", Constants.LOGIN_SOURCE);
params.put("agentName", binding.text6.getText() + "");
params.put("agentAddress",binding.textAddress.getText()+"");
params.put("agentAddress", binding.textAddress.getText() + "");
params.put("userIdImgUrl", imgUrl1);
} else {//单位
params.put("userName", binding.text10.getText().toString().trim());
@@ -490,7 +495,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
params.put("agentIdType", "101");
params.put("certifyChannel", "BAIDUOCR");
params.put("agentName", binding.text16.getText().toString().trim());
params.put("agentAddress",binding.textDwAddress.getText()+"");
params.put("agentAddress", binding.textDwAddress.getText() + "");
params.put("department", binding.text11.getText().toString().trim());
params.put("userIdImgUrl", imgUrl8);
}
@@ -500,7 +505,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
binding.nextStep.setEnabled(true);
if ("PERSONAL_USER".equals(getIntent().getStringExtra("userType")) || "1".equals(getIntent().getStringExtra("userType"))) {//个人
HashMap<String, Object> grParams = new HashMap<>();
grParams.put("customerIdVld", binding.text5.getText() + "");//过期时间
grParams.put("customerIdVld", binding.text5.getText().toString().replace("-",""));//过期时间
grParams.put("emergencyFlag", "0");//应急车辆用户标识 0-非应急车辆用户 1-应急车辆用户
grParams.put("isAgent", isAgent);//是否本人办理
grParams.put("orderId", getIntent().getStringExtra("orderId"));//订单编号
@@ -517,7 +522,7 @@ public class IdentityInformationUploadActivity extends AppActivity {

grParams.put("agentIdNum", binding.text7.getText() + "");//经办人证件号码
grParams.put("agentIdType", "101");//经办人证件类型
grParams.put("agentIdVld", binding.text8.getText() + "");//经办人证件有效期
grParams.put("agentIdVld", binding.text8.getText().toString().replace("-",""));//经办人证件有效期
grParams.put("agentName", binding.text6.getText() + "");//经办人姓名
grParams.put("agentAddress", binding.textAddress.getText() + "");//经办人姓名
grParams.put("agentPosImgUrl", imgUrl3);//经办人正面图片地址
@@ -571,12 +576,12 @@ public class IdentityInformationUploadActivity extends AppActivity {
dwParams.put("userIdType", "203");//用户证件类型
dwParams.put("userName", binding.text10.getText().toString().trim());//开户人姓名
dwParams.put("userPosImgUrl", imgUrl8);//用户证件正面照片地址
dwParams.put("userNegImgUrl",imgUrl8);//用户证件反面照片地址
dwParams.put("userNegImgUrl", imgUrl8);//用户证件反面照片地址
// dwParams.put("userTel",binding.text2.getText() + "");//开户人手机号码

dwParams.put("agentIdNum", binding.text14.getText().toString().trim());//经办人证件号码
dwParams.put("agentIdType", "101");//经办人证件类型
dwParams.put("agentIdVld", binding.text15.getText() + "");//经办人证件有效期
dwParams.put("agentIdVld", binding.text15.getText().toString().replace("-",""));//经办人证件有效期
dwParams.put("agentName", binding.text16.getText().toString().trim());//经办人姓名
dwParams.put("agentAddress", binding.textDwAddress.getText().toString().trim());//经办人姓名
dwParams.put("agentPosImgUrl", imgUrl6);//经办人正面图片地址
@@ -584,7 +589,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
dwParams.put("tel", binding.text13.getText().toString().trim());//经办人电话
dwParams.put("agentTel", binding.text13.getText().toString().trim());//经办人电话
dwParams.put("agentGender", gender);//经办人性别
String ifcode = IFCode.IFCODE20;
String ifcode = IFCode.IFCODE20;
MyRetrofit.newInstanceGZ(IdentityInformationUploadActivity.this, ifcode, dwParams, new MyRetrofit.ReturnResult() {
@Override
public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
@@ -607,6 +612,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
}
finish();
}

@Override
public void onError(Result resp) {
MyRetrofit.ReturnResult.super.onError(resp);
@@ -647,33 +653,55 @@ public class IdentityInformationUploadActivity extends AppActivity {
binding.startImg.setVisibility(View.VISIBLE);
} else if (view.getId() == R.id.text_two) {
isAgent = true;
binding.textZjlx.setText(EnumBean.backValue(ownerIdType, EnumBean.ID_TYPE));
binding.textTwo.setTextColor(getResources().getColor(R.color.text99));
binding.textTwo.setBackgroundResource(R.drawable.pwk_input_item_border_gray5);
binding.layout2.setVisibility(View.VISIBLE);
binding.startImg1.setVisibility(View.VISIBLE);
}
} else if (view == binding.text5 || view == binding.text8 || view == binding.text15) {
// 日期选择对话框
new DateDialog.Builder(this, calendar.get(Calendar.YEAR), 2100)
.setTitle(getString(R.string.date_title))
// 确定按钮文本
.setConfirm(getString(R.string.common_confirm))
// 设置 null 表示不显示取消按钮
.setCancel(getString(R.string.common_cancel))
.setListener((dialog, year, month, day) -> {
if (month < (calendar.get(Calendar.MONTH) + 1)) {
toast("过期时间不能小于当前时间");
} else {
if (day < calendar.get(Calendar.DAY_OF_MONTH)) {
toast("过期时间不能小于当前时间");
} else {
TextView textView = (TextView) view;
textView.setText(year + "-" + month + "-" + day);
}
}
})
.show();
} else if (view == binding.textZjlx) {
EnumListDialog.showEnumListSingleDialog(IdentityInformationUploadActivity.this, EnumBean.ID_TYPE, new EnumListDialog.OnResultCallback() {
@Override
public void onResultCallback(String code, String name) {
binding.textZjlx.setText(name);
ownerIdType = code;
binding.text6.setText("");
binding.textAddress.setText("");
binding.text7.setText("");
binding.text8.setText("");
}
});
}
// else if (view == binding.text5 || view == binding.text8 || view == binding.text15) {
// // 日期选择对话框
// new DateDialog.Builder(this, calendar.get(Calendar.YEAR), 2100)
// .setTitle(getString(R.string.date_title))
// // 确定按钮文本
// .setConfirm(getString(R.string.common_confirm))
// // 设置 null 表示不显示取消按钮
// .setCancel(getString(R.string.common_cancel))
// .setListener((dialog, year, month, day) -> {
// String time = year + "-" + (month < 10 ? "0" + month : month) + "-" + (day < 10 ? "0" + day : day);
// if (year == (calendar.get(Calendar.YEAR))){
// if (month < (calendar.get(Calendar.MONTH) + 1)) {
// toast("过期时间不能小于当前时间");
// } else {
// if (day < calendar.get(Calendar.DAY_OF_MONTH)) {
// toast("过期时间不能小于当前时间");
// } else {
// TextView textView = (TextView) view;
// textView.setText(time);
// }
// }
// }else {
//
// TextView textView = (TextView) view;
// textView.setText(time);
// }
// })
// .show();
// }


}

@@ -682,7 +710,8 @@ public class IdentityInformationUploadActivity extends AppActivity {
@SuppressLint({"NewApi", "LogNotTimber"})
@SingleClick
public void onImage(View view) {
if (view == binding.image5 || view == binding.image9) {//委托书
if (view == binding.image5 || view == binding.image9||(view == binding.image3&&!ownerIdType.equals("101"))||
(view == binding.image4&&!ownerIdType.equals("101"))) {//委托书
String type = "";
file1 = FileUtil.getSaveFile(getApplication()).getAbsolutePath();
type = CameraActivity.CONTENT_TYPE_GENERAL;
@@ -694,8 +723,12 @@ public class IdentityInformationUploadActivity extends AppActivity {
GlideApp.with(getActivity()).load(url).into((ImageView) view);
if (view == binding.image5) {
imgUrl5 = url;
} else {
} else if (view == binding.image9){
imgUrl9 = url;
}else if (view == binding.image3){
imgUrl3 = url;
}else {
imgUrl4 = url;
}
}
}
@@ -942,7 +975,7 @@ public class IdentityInformationUploadActivity extends AppActivity {

setText(binding.text6, bizContent.getName());
setText(binding.text7, bizContent.getIdno());
setText(binding.textAddress,bizContent.getAddress());
setText(binding.textAddress, bizContent.getAddress());

} else if (view == binding.image2) {
//过期时间
@@ -958,9 +991,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
} catch (ParseException e) {
e.printStackTrace();
}
} else if ("长期".equals(bizContent.getEnddate())){
} else if ("长期".equals(bizContent.getEnddate())) {
setText(binding.text5, bizContent.getEnddate());
}else{
} else {
toast("未识别出证件有效时间");
return;
}
@@ -983,9 +1016,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
} catch (ParseException e) {
e.printStackTrace();
}
}else if ("长期".equals(bizContent.getEnddate())){
} else if ("长期".equals(bizContent.getEnddate())) {
setText(binding.text8, bizContent.getEnddate());
}else{
} else {
toast("未识别出证件有效时间");
return;
}
@@ -1003,7 +1036,7 @@ public class IdentityInformationUploadActivity extends AppActivity {
gender = "男".equals(bizContent.getGender()) ? "MAN" : "WOMAN";
setText(binding.text14, bizContent.getIdno());
setText(binding.text16, bizContent.getName());
setText(binding.textDwAddress,bizContent.getAddress());
setText(binding.textDwAddress, bizContent.getAddress());
} else if (view == binding.image7) {
//过期时间
if (!FunHelper.isEmpty(bizContent.getEnddate()) && bizContent.getEnddate().length() == 8) {
@@ -1018,9 +1051,9 @@ public class IdentityInformationUploadActivity extends AppActivity {
} catch (ParseException e) {
e.printStackTrace();
}
}else if ("长期".equals(bizContent.getEnddate())){
} else if ("长期".equals(bizContent.getEnddate())) {
setText(binding.text15, bizContent.getEnddate());
}else{
} else {
toast("未识别出证件有效时间");
return;
}

+ 10
- 3
app/src/main/java/com/huntersun/vkyes/etcopencard/project/ui/fragment/FragmentHomeFour.java Просмотреть файл

@@ -105,9 +105,16 @@ public class FragmentHomeFour extends TitleBarFragment<MainActivity> {
public void onClick(View view) {
if (view == binding.sbPersonDataAddress) {
new Utils().showMessDialog(getActivity(), "是否确认退出登录?", dialog -> {
startActivity(LoginActivity.class);
// 进行内存优化，销毁除登录页之外的所有界面
ActivityManager.getInstance().finishAllActivities(LoginActivity.class);
HashMap<String,String> params = new HashMap<>();
params.put("accessToken",MyShared.getInstance().get(MyShared.ACCESSTOKEN,"")+"");
MyRetrofit.newInstanceGZ(getActivity(), IFCode.IFCODE_LOGINOUT, params, new MyRetrofit.ReturnResult() {
@Override
public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {
startActivity(LoginActivity.class);
// 进行内存优化，销毁除登录页之外的所有界面
ActivityManager.getInstance().finishAllActivities(LoginActivity.class);
}
});
});
} else if (view == binding.sbPersonDataPassword) {
Intent intent = new Intent();

+ 1
- 0
app/src/main/java/com/huntersun/vkyes/etcopencard/src/ui/activity/LoginActivity.java Просмотреть файл

@@ -594,6 +594,7 @@ public final class LoginActivity extends AppActivity implements KeyboardWatcher.
private void sendCode() {
Map<String, String> params = new HashMap<>();
params.put("mobile", FunHelper.getText(mPhoneView));
params.put("businessType","0");//businessType 0-登录 1-注册 2-忘记密码 3-修改手机号
MyRetrofit.newInstanceGZ(this, IFCode.IFCODE2, params, new MyRetrofit.ReturnResult() {
@Override
public void onSuccess(ResultBean resultBean, ResultBean.BizContent bizContent) {

+ 1
- 1
app/src/main/res/layout-v2/fragment_home_four.xml Просмотреть файл

@@ -108,7 +108,7 @@
<Button
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:visibility="visible"
android:visibility="invisible"
android:layout_margin="@dimen/dp_20"
android:id="@+id/btn_test"
android:background="@color/green01"

+ 63
- 29
app/src/main/res/layout/activity_identity_information_upload.xml Просмотреть файл

@@ -720,7 +720,7 @@
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

<TextView
<EditText
android:id="@+id/text5"
style="@style/EditTextStyle"
android:layout_width="0dp"
@@ -729,13 +729,13 @@
android:gravity="center_vertical"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:hint="请选择过期时间"
android:hint="格式yyyy-mm-dd"
android:paddingHorizontal="@dimen/dp_15" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrows_right_ic" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/arrows_right_ic" />-->

</LinearLayout>

@@ -781,7 +781,7 @@
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_14"
android:layout_marginBottom="@dimen/dp_12"
android:text="经办人信息"
android:text="车主信息"
android:textColor="#333333"
android:textSize="@dimen/sp_16" />

@@ -791,7 +791,41 @@
android:background="@drawable/home_unm_bg2"
android:orientation="vertical"
android:padding="@dimen/dp_15">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#FFFFFF"
android:gravity="center_vertical"
android:minHeight="@dimen/dp_45">

<TextView
android:layout_width="@dimen/dp_90"
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="证件类型"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

<TextView
android:id="@+id/text_zjlx"
style="@style/EditTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@color/white"
android:layout_weight="1"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:hint="请选择证件类型"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_10" />

<ImageView
android:layout_width="20dp"
android:layout_height="20dp"
android:src="@drawable/arrows_right_ic" />

</LinearLayout>
<View style="@style/HorizontalLineStyle" />

<LinearLayout
@@ -821,7 +855,7 @@
android:layout_height="@dimen/dp_30"
android:background="@drawable/home_unm_bg3"
android:gravity="center"
android:text="拍摄人像面"
android:text="证件正面照"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_12" />

@@ -853,7 +887,7 @@
android:layout_height="@dimen/dp_30"
android:background="@drawable/home_unm_bg3"
android:gravity="center"
android:text="拍摄国徽面"
android:text="证件反面照"
android:textColor="#FFFFFF"
android:textSize="@dimen/sp_12" />

@@ -952,7 +986,7 @@
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="经办人姓名"
android:text="车主姓名"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

@@ -964,7 +998,7 @@
android:background="@color/white"
android:maxLength="20"
android:drawablePadding="@dimen/dp_15"
android:hint="请输入经办人姓名"
android:hint="请输入车主姓名"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

@@ -988,7 +1022,7 @@
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="经办人电话"
android:text="车主电话"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

@@ -999,7 +1033,7 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:hint="请输入经办人电话"
android:hint="请输入车主电话"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

@@ -1022,7 +1056,7 @@
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="经办人地址"
android:text="车主地址"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

@@ -1033,7 +1067,7 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:hint="请输入经办人地址"
android:hint="请输入车主地址"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

@@ -1056,7 +1090,7 @@
android:layout_height="match_parent"
android:drawableLeft="@mipmap/must"
android:gravity="center_vertical"
android:text="经办人证件号"
android:text="车主证件号"
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

@@ -1067,7 +1101,7 @@
android:layout_height="wrap_content"
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:hint="请输入经办人证件号"
android:hint="请输入车主证件号"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

@@ -1095,7 +1129,7 @@
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

<TextView
<EditText
android:id="@+id/text8"
style="@style/EditTextStyle"
android:layout_width="wrap_content"
@@ -1103,14 +1137,14 @@
android:background="@color/white"
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:hint="请选择证件有效日期"
android:hint="格式yyyy-mm-dd"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrows_right_ic" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/arrows_right_ic" />-->

</LinearLayout>

@@ -1606,7 +1640,7 @@
android:textSize="@dimen/sp_14"
tools:ignore="UseCompatTextViewDrawableXml" />

<TextView
<EditText
style="@style/EditTextStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -1614,14 +1648,14 @@
android:drawablePadding="@dimen/dp_15"
android:gravity="center_vertical"
android:id="@+id/text15"
android:hint="请选择证件有效日期"
android:hint="格式yyyy-mm-dd"
android:minHeight="@dimen/dp_45"
android:paddingHorizontal="@dimen/dp_20" />

<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/arrows_right_ic" />
<!-- <ImageView-->
<!-- android:layout_width="wrap_content"-->
<!-- android:layout_height="wrap_content"-->
<!-- android:src="@drawable/arrows_right_ic" />-->

</LinearLayout>


+ 2
- 2
common.gradle Просмотреть файл

@@ -9,8 +9,8 @@ android {
// 目标适配版本
//noinspection ExpiredTargetSdkVersion,OldTargetApi
targetSdkVersion 30
versionName '1.3.4'
versionCode 11
versionName '1.3.5'
versionCode 12
//当前线上版本 103 5
}


Редактирование Предпросмотр
Загрузка…
Отмена
Сохранить