diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java index fdbd16c..9c57020 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/AuthQualificationActivity.java @@ -18,10 +18,13 @@ import android.widget.Toast; import androidx.annotation.Nullable; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONObject; import com.arpa.hndahesudintocctmsdriver.parts.UserParts; import com.arpa.hndahesudintocctmsdriver.util.string.StringUtil; import com.bumptech.glide.Glide; import com.esign.esignsdk.EsignSdk; +import com.esign.esignsdk.data.AuthEvent; import com.github.gzuliyujiang.wheelpicker.DatePicker; import com.github.gzuliyujiang.wheelpicker.annotation.DateMode; import com.google.gson.Gson; @@ -45,6 +48,8 @@ import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; import com.lxj.xpopup.util.SmartGlideImageLoader; +import org.greenrobot.eventbus.Subscribe; + import java.io.File; import java.util.List; @@ -101,6 +106,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity { BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("driverAuthQualification"), BaseBean.class); if (bb.getCode() == 200) { // initAuth(); + isAuth = true; //判断是否从车辆进来 carId为空从个人认证进来需跳转实名认证，不为空车辆信息进入，需跳转车辆照片 if (TextUtils.isEmpty(carId)) { //从业资格证->实名认证 @@ -155,6 +161,7 @@ public class AuthQualificationActivity extends BaseAppCompatActivity { // finish(); EsignSdk.getInstance().startH5Activity(act, StringUtil.isNull(String.valueOf(bb.getData()), "")); } else { + finish(); Toast.makeText(con, bb.getMsg(), Toast.LENGTH_LONG).show(); }//Log.e("url",CacheGroup.cacheList.get("authUrl")); CacheGroup.cacheList.remove("authUrl"); @@ -243,12 +250,14 @@ public class AuthQualificationActivity extends BaseAppCompatActivity { } }); value2.setOnClickListener(v -> { - DatePicker picker = new DatePicker(this); - picker.setBodyWidth(300); - picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day)); - picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY); - picker.getWheelLayout().setDateLabel("年", "月", "日"); - picker.show(); + if (!isAuth) { + DatePicker picker = new DatePicker(this); + picker.setBodyWidth(300); + picker.setOnDatePickedListener((year, month, day) -> value2.setText(year + "-" + month + "-" + day)); + picker.getWheelLayout().setDateMode(DateMode.YEAR_MONTH_DAY); + picker.getWheelLayout().setDateLabel("年", "月", "日"); + picker.show(); + } }); submit.setOnClickListener(v -> { if (!isAuth) { @@ -379,4 +388,31 @@ public class AuthQualificationActivity extends BaseAppCompatActivity { } } + + @Subscribe + public void processResult(AuthEvent auth) { + //添加实名/意愿/签署完成之后的逻辑 + Log.e("-回调信息-", auth.result); + JSONObject jsonObject = JSON.parseObject(auth.result); + if ("success".equalsIgnoreCase(jsonObject.getString("res"))) { + if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) { + Toast.makeText(con, "签署场景成功", Toast.LENGTH_SHORT).show(); + } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) { + Toast.makeText(con, "实名认证成功", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "意愿认证成功", Toast.LENGTH_SHORT).show(); + } + finish(); + } else { + if ("sign".equalsIgnoreCase(jsonObject.getString("key"))) { + Toast.makeText(con, "签署场景失败", Toast.LENGTH_SHORT).show(); + } else if ("realName".equalsIgnoreCase(jsonObject.getString("key"))) { + Toast.makeText(con, "实名认证失败", Toast.LENGTH_SHORT).show(); + } else { + Toast.makeText(con, "意愿认证失败", Toast.LENGTH_SHORT).show(); + } + EsignSdk.getInstance().finishH5Activity(); + finish(); + } + } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java index 63f2e26..a487c2d 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/img/ImageGetUtil.java @@ -9,6 +9,8 @@ import android.provider.MediaStore; import androidx.core.content.FileProvider; +import com.dahe.mylibrary.utils.AppUtils; + import java.io.File; import java.io.IOException; import java.text.SimpleDateFormat; @@ -39,7 +41,7 @@ public class ImageGetUtil { if(imageFile!=null){ if(Build.VERSION.SDK_INT>= Build.VERSION_CODES.N){ /*7.0以上要通过FileProvider将File转化为Uri*/ - uri = FileProvider.getUriForFile(act.getApplicationContext(),"com.arpa.hndahesudintocctmsdriver.fileprovider",imageFile); + uri = FileProvider.getUriForFile(act.getApplicationContext(), AppUtils.getAppPackageName()+".fileprovider",imageFile); }else { /*7.0以下则直接使用Uri的fromFile方法将File转化为Uri*/ uri = Uri.fromFile(imageFile); diff --git a/app/src/main/res/layout/activity_auth_qualification.xml b/app/src/main/res/layout/activity_auth_qualification.xml index 91ee26d..a88694a 100644 --- a/app/src/main/res/layout/activity_auth_qualification.xml +++ b/app/src/main/res/layout/activity_auth_qualification.xml @@ -163,20 +163,20 @@ android:textColor="#ffc4c4ce" android:textSize="@dimen/sp_13" /> + + android:ellipsize="end" + android:gravity="right" + android:hint="点击进行手动输入" + android:maxLines="1" + android:textColor="#ff999999" + android:textSize="@dimen/sp_13" />