Skip to content

android / dayu

Go to a project
Commit 2dbc2e48 by 罗翻
Options

Merge branch 'dev' into test

parents ace85e85 883f6d37
Inline Side-by-side
Showing with 70 additions and 48 deletions
app/src/main/java/com/dayu/bigfish/ui/MainActivity.java
......@@ -36,6 +36,7 @@ import com.dayu.order.ui.fragment.HomeOrderFragment;
import com.dayu.provider.event.RefreshReceivingNum;
import com.dayu.provider.event.SwtichFragment;
import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.ui.activity.IdentityCertificationActivity;
import com.dayu.usercenter.ui.fragment.HomePersonFragment;
import com.dayu.utils.badgeNumberManger.BadgeNumberManager;
import com.dayu.widgets.CustomDialog;
......@@ -259,7 +260,7 @@ public class MainActivity extends BaseActivity<MainPresenter, ActivityMainBindin
@Override
public void dumpReceActivity() {
Intent intent = new Intent(mActivity, ReceivingActivity.class);
Intent intent = new Intent(mActivity, IdentityCertificationActivity.class);
startActivity(intent);
overridePendingTransition(R.anim.slide_bottom_in, 0);
}
......
baseSDK/src/main/res/values/strings.xml
......@@ -409,6 +409,30 @@
<string name="input_real_name">请输入真实姓名</string>
<string name="input_identity">请输入证件号</string>
<string name="no_header">暂无头像</string>
<string name="certification_license">认证资质</string>
<string name="license_detail">资质说明</string>
<string name="certification_title">实名认证</string>
<string name="certification_error">联网授权失败！请检查网络或找服务商</string>
<string name="certification_getphoto_error">获取相机权限失败</string>
<string name="next_step">下一步</string>
<string name="accredit_error">授权失败</string>
<string name="certification_success">认证成功</string>
<string name="certification_fail">认证失败</string>
<string name="certification_again">重新认证</string>
<string name="certification_face">活体检测</string>
<string name="congratulation_certification_success">恭喜，认证成功！</string>
<string name="go_receive_order">快去看看有没有可接的工单吧~</string>
<string name="known">我知道了</string>
<string name="certification_secrete">刷脸成功小秘诀</string>
<string name="please_upload_cleare_identity">请上传清晰有效身份</string>
<string name="please_upload_yourself_face">请采集您本人的面孔</string>
<string name="server_error">系统异常,请稍后重试</string>
<string name="please_upload_identity_front">请上传身份证正面</string>
<string name="certification_not_pass">您的活检认证暂未通过</string>
<string name="certificaiton_import_notice">信息仅用于身份验证，大鱼师傅保障您的信息安全</string>
<string name="certificaiton_notice">&#160;1.&#160;&#160;&#160;&#160;请摘下帽子口罩，不要遮挡面部\n
2.&#160;&#160;&#160;&#160;保证光线充足，保持水平拍摄\n
3.&#160;&#160;&#160;&#160;镜头对准您的脸，按提示操作\n</string>
<!--error-->
......
userCenter/src/main/java/com/dayu/usercenter/presenter/certification/CertificaitonPresenter.java
......@@ -3,10 +3,8 @@ package com.dayu.usercenter.presenter.certification;
import android.os.Bundle;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.ui.activity.FaceCertificationActivity;
import com.dayu.utils.ToastUtils;
import java.io.File;
import java.util.List;
......@@ -50,16 +48,16 @@ public class CertificaitonPresenter extends CertificaitonContract.Presenter {
@Override
public void verifyIdentity(List<String> list) {
UserApiFactory.verifyIdentity(list.get(0), list.get(1)).subscribe(baseObserver(aBoolean -> {
if (aBoolean) {
ToastUtils.showShortToast("身份证上传成功!");
Bundle bundle = new Bundle();
bundle.putString(UserConstant.FRONT_URL, list.get(0));
bundle.putString(UserConstant.BACK_URL, list.get(1));
mView.startActivity(FaceCertificationActivity.class, bundle);
} else {
ToastUtils.showShortToast("您传的身份证不合格，请重新上传!");
}
}));
// UserApiFactory.verifyIdentity(list.get(0), list.get(1)).subscribe(baseObserver(aBoolean -> {
// if (aBoolean) {
// ToastUtils.showShortToast("身份证上传成功!");
// Bundle bundle = new Bundle();
// bundle.putString(UserConstant.FRONT_URL, list.get(0));
// bundle.putString(UserConstant.BACK_URL, list.get(1));
// mView.startActivity(FaceCertificationActivity.class, bundle);
// } else {
// ToastUtils.showShortToast("您传的身份证不合格，请重新上传!");
// }
// }));
}
}
userCenter/src/main/java/com/dayu/usercenter/presenter/facecertification/FaceCertificaitonPresenter.java
......@@ -4,9 +4,11 @@ import android.os.Bundle;
import com.dayu.base.api.BaseApiFactory;
import com.dayu.event.UserInfo;
import com.dayu.usercenter.R;
import com.dayu.usercenter.api.UserApiFactory;
import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.ui.activity.CertificationResultActivity;
import com.dayu.utils.UIUtils;
import com.dayu.utils.UserManager;
import org.json.JSONObject;
......@@ -79,20 +81,20 @@ public class FaceCertificaitonPresenter extends FaceCertificaitonContract.Presen
UserInfo info = UserManager.getInstance().getUser();
info.setDetectStatus(1);
UserManager.getInstance().saveUser(info);
bundle.putString(UserConstant.DETECT_STATE, "认证成功");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.certification_success));
mView.startActivity(CertificationResultActivity.class, bundle);
}
}, responeThrowable -> {
if ("DETECT_ERROR00001".equals(responeThrowable.subCode)) {
bundle.putString(UserConstant.DETECT_STATE, "请上传清晰有效身份");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_cleare_identity));
}else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
bundle.putString(UserConstant.DETECT_STATE, "请采集您本人的面孔");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_yourself_face));
} else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
bundle.putString(UserConstant.DETECT_STATE, "系统异常,请稍后重试");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.server_error));
} else if ("DETECT_ERROR00003".equals(responeThrowable.subCode)) {
bundle.putString(UserConstant.DETECT_STATE, "请上传身份证正面");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.please_upload_identity_front));
} else {
bundle.putString(UserConstant.DETECT_STATE, "您的活检认证暂未通过");
bundle.putString(UserConstant.DETECT_STATE, UIUtils.getString(R.string.certification_not_pass));
}
mView.startActivity(CertificationResultActivity.class, bundle);
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/CertificationResultActivity.java
......@@ -10,7 +10,6 @@ import com.dayu.provider.router.RouterPath;
import com.dayu.usercenter.R;
import com.dayu.usercenter.common.UserConstant;
import com.dayu.usercenter.databinding.ActivityCertificationResultBinding;
import com.dayu.utils.AppManager;
/**
* Created by luofan
......@@ -25,22 +24,22 @@ public class CertificationResultActivity extends DataBindingActivity<ActivityCer
@Override
public void initView() {
mBind.tvTitle.setText("实名认证");
mBind.tvTitle.setText(getString(R.string.certification_title));
Bundle bundle = getIntent().getBundleExtra(Constants.BUNDLE);
String state = bundle.getString(UserConstant.DETECT_STATE);
if (!"认证成功".equals(state)) {
if (!getString(R.string.certification_success).equals(state)) {
mBind.ivIcon.setImageResource(R.drawable.icon_certification_failure);
mBind.tvResult.setText("认证失败!");
mBind.tvResult.setText(getString(R.string.certification_fail));
mBind.tvNotice.setText(state);
mBind.tvCommite.setText("重新认证");
mBind.tvCommite.setText(getString(R.string.certification_again));
mBind.tvCommite.setOnClickListener(v -> {
if (state != null && state.contains("活体检测")) {
if (state != null && state.contains(getString(R.string.certification_face))) {
finish();
} else {
// AppManager.getInstance().finishActivity(FaceCertificationActivity.class);
Intent intent = new Intent(mActivity, IdentityCertificationActivity.class);
startActivity(intent);
finish();
AppManager.getInstance().finishActivity(FaceCertificationActivity.class);
}
});
} else {
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/FaceCertificationActivity.java
......@@ -49,7 +49,7 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
public void initView() {
mBind.tvNext.setOnClickListener(v -> requestCameraPerm());
mBind.titleBack.setOnClickListener(v -> finish());
mBind.tvTitle.setText("实名认证");
mBind.tvTitle.setText(getString(R.string.certification_title));
uuid = ConUtil.getUUIDString(this);
new Thread(() -> {
Manager manager = new Manager(FaceCertificationActivity.this);
......@@ -57,7 +57,7 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
manager.registerLicenseManager(licenseManager);
manager.takeLicenseFromNetwork(uuid);
if (licenseManager.checkCachedLicense() < 0) {
runOnUiThread(() -> ToastUtils.showShortToast("授权失败"));
runOnUiThread(() -> ToastUtils.showShortToast(getString(R.string.accredit_error)));
}
}).start();
}
......@@ -88,7 +88,7 @@ public class FaceCertificationActivity extends BaseActivity<FaceCertificaitonPre
String permissions[], int[] grantResults) {
if (requestCode == EXTERNAL_STORAGE_REQ_CAMERA_CODE) {
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {// Permission Granted
ConUtil.showToast(this, "获取相机权限失败");
ConUtil.showToast(this, getString(R.string.certification_getphoto_error));
} else
enterNextPage();
}
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/IdentityCertificationActivity.java
......@@ -58,7 +58,7 @@ public class IdentityCertificationActivity extends BaseActivity<CertificaitonPre
@Override
public void initView() {
mBind.tvTitle.setText("实名认证");
mBind.tvTitle.setText(getString(R.string.certification_title));
mBind.ivFront.setOnClickListener(v -> {
if (mFrontFlag) {
imgMax(mFrontBitmap);
......@@ -133,7 +133,7 @@ public class IdentityCertificationActivity extends BaseActivity<CertificaitonPre
private void authState(boolean isSuccess) {
if (isSuccess) {
} else {
runOnUiThread(() -> ToastUtils.showShortToast("联网授权失败！请检查网络或找服务商"));
runOnUiThread(() -> ToastUtils.showShortToast(getString(R.string.certification_error)));
}
}
......@@ -149,7 +149,7 @@ public class IdentityCertificationActivity extends BaseActivity<CertificaitonPre
String permissions[], int[] grantResults) {
if (requestCode == EXTERNAL_STORAGE_REQ_CAMERA_CODE) {
if (grantResults[0] != PackageManager.PERMISSION_GRANTED) {// Permission Granted
Util.showToast(this, "获取相机权限失败");
Util.showToast(this, getString(R.string.certification_getphoto_error));
} else {
enterNextPage(mSide);
}
......@@ -162,10 +162,8 @@ public class IdentityCertificationActivity extends BaseActivity<CertificaitonPre
if (requestCode == INTO_IDCARDSCAN_PAGE && resultCode == RESULT_OK) {
runOnUiThread(() -> {
byte[] idcardImgData = data.getByteArrayExtra("idcardImg");
BitmapFactory.Options options = new BitmapFactory.Options();
options.inSampleSize = 2;
Bitmap idcardBmp = BitmapFactory.decodeByteArray(idcardImgData, 0,
idcardImgData.length,options);
idcardImgData.length);
if (mSide == 0) {
mFrontBitmap = idcardBmp;
mBind.ivFront.setImageBitmap(idcardBmp);
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/LicenceDetailActivity.java
......@@ -20,7 +20,7 @@ public class LicenceDetailActivity extends BaseActivity<LicenceDetailPresenter,
@Override
public void initView() {
mBind.tvTitle.setText("资质说明");
mBind.tvTitle.setText(getString(R.string.license_detail));
}
@Override
......
userCenter/src/main/java/com/dayu/usercenter/ui/activity/QualityCertificationActivity.java
......@@ -31,7 +31,7 @@ public class QualityCertificationActivity extends BaseActivity<QualityCertificai
@Override
public void initView() {
mBind.tvTitle.setText("认证资质");
mBind.tvTitle.setText(getString(R.string.certification_license));
mBind.recyclerView.setOnItemClickListener(new OnItemClickListener<LicenceInfo, ItemQualityCertificationBinding>() {
@Override
public void OnItemClick(LicenceInfo item, ItemQualityCertificationBinding bind) {
......
userCenter/src/main/res/layout/activity_certification_layout.xml
......@@ -116,7 +116,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:text="下一步"
android:text="@string/next_step"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</RelativeLayout>
......@@ -126,7 +126,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="信息仅用于身份验证，大鱼师傅保障您的信息安全"
android:text="@string/certificaiton_import_notice"
android:textColor="@color/default_editext_color"
android:textSize="@dimen/sp_14" />
</LinearLayout>
......
userCenter/src/main/res/layout/activity_certification_result.xml
......@@ -60,7 +60,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="22dp"
android:text="恭喜，认证成功！"
android:text="@string/congratulation_certification_success"
android:textColor="@color/default_text_color"
android:textSize="@dimen/sp_16"
android:textStyle="bold" />
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="18dp"
android:text="快去看看有没有可接的工单吧~"
android:text="@string/go_receive_order"
android:textColor="@color/text_color"
android:textSize="@dimen/sp_14" />
......@@ -85,7 +85,7 @@
android:gravity="center"
android:layout_marginRight="@dimen/dp_15"
android:layout_marginLeft="@dimen/dp_15"
android:text="确定"
android:text="@string/comfirm"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
......
userCenter/src/main/res/layout/activity_face_certification.xml
......@@ -61,7 +61,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="@dimen/dp_11"
android:text="刷脸成功小秘诀"
android:text="@string/certification_secrete"
android:textColor="#FF424242"
android:textSize="16sp"
android:textStyle="bold" />
......@@ -71,7 +71,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="74dp"
android:text="刷脸成功小秘诀"
android:text="@string/certificaiton_notice"
android:textColor="#FF424242"
android:textSize="14sp" />
......@@ -83,7 +83,7 @@
android:layout_marginRight="15dp"
android:background="@drawable/icon_next_button"
android:gravity="center"
android:text="我知道了"
android:text="@string/known"
android:textColor="@color/white"
android:textSize="@dimen/sp_16" />
</LinearLayout>
......
userCenter/src/main/res/layout/activity_licence_detail.xml
......@@ -55,7 +55,7 @@
android:id="@+id/tv_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text='@{presenter.mItem.name,default="维修电脑初级工程师》"}'
android:text='@{presenter.mItem.name}'
android:textColor="@color/default_text_color"
android:textSize="16sp" />
......@@ -65,7 +65,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="@dimen/dp_20"
android:layout_marginTop="10dp"
android:text='@{presenter.mItem.licenceAuthorityName,default="大鱼官方认证"}'
android:text='@{presenter.mItem.licenceAuthorityName}'
android:textColor="@color/default_editext_color"
android:textSize="14sp" />
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment