diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index d1cc35b..753e2f3 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -185,6 +185,9 @@ + diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java index cc72aea..a349d49 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/H5Activity.java @@ -45,6 +45,7 @@ import com.arpa.hndahesudintocctmsdriver.request.UserRequset; import com.arpa.hndahesudintocctmsdriver.ui.MainActivity; import com.arpa.hndahesudintocctmsdriver.ui.UiAuxiliary; import com.arpa.hndahesudintocctmsdriver.ui.auth.CertificatesActivity; +import com.arpa.hndahesudintocctmsdriver.ui.auth.FaceSuccActivity; import com.arpa.hndahesudintocctmsdriver.ui.home.StartYunDanActivity; import com.arpa.hndahesudintocctmsdriver.util.MessageUtils; import com.dahe.mylibrary.utils.ActivityUtils; @@ -100,13 +101,13 @@ public class H5Activity extends AppCompatActivity { WebSettings webSetting = mWebView.getSettings(); String title = getIntent().getStringExtra("title"); - if (!TextUtils.isEmpty(title)){ + if (!TextUtils.isEmpty(title)) { tvTitle.setText(title); } back.setOnClickListener(v -> { - if (isOk){ - ActivityUtils.finishToActivity(MainActivity.class,false); + if (isOk) { + ActivityUtils.finishToActivity(MainActivity.class, false); return; } if (mWebView.canGoBack()) { @@ -117,8 +118,8 @@ public class H5Activity extends AppCompatActivity { }); close.setOnClickListener(v -> { - if (isOk){ - ActivityUtils.finishToActivity(MainActivity.class,false); + if (isOk) { + ActivityUtils.finishToActivity(MainActivity.class, false); return; } if (mWebView.canGoBack()) { @@ -224,13 +225,22 @@ public class H5Activity extends AppCompatActivity { String url = intent.getStringExtra("url"); viewFile = intent.getBooleanExtra("view_file", false); if (url.startsWith("alipay")) { - try { Intent intent2 = new Intent(Intent.ACTION_VIEW, Uri.parse(url)); + intent2.putExtra("isGoCar",isGoCar); startActivity(intent2); return; } catch (Exception e) { } + }else if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { + Intent in = new Intent(ctx, FaceSuccActivity.class); + startActivity(in); + if (isGoCar) { + ActivityUtils.finishToActivity(MainActivity.class, false); + }else{ + finish(); + } + return; } if (curUrl == null) { curUrl = url; @@ -250,17 +260,29 @@ public class H5Activity extends AppCompatActivity { Uri uri = Uri.parse(url); Log.e("test", "要加载的地址:" + uri.getScheme() + " " + url + " "); if (uri.getScheme().equals("http") || uri.getScheme().equals("https")) { - if (isGoCar&&url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")){ - isOk = true; - view.loadUrl(url); - new MessageUtils().showSimCenPop(ctx, "个人信息上传成功，请添加车辆信息!", "去添加",() -> { - Intent in = new Intent(ctx, CertificatesActivity.class); - in.putExtra("index", 2); - startActivity(in); - ActivityUtils.finishToActivity(MainActivity.class,false); - }); + if (url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")) { + Intent in = new Intent(ctx, FaceSuccActivity.class); + in.putExtra("isGoCar",isGoCar); + startActivity(in); + if (isGoCar) { + ActivityUtils.finishToActivity(MainActivity.class, false); + }else{ + finish(); + } return true; } + +// if (isGoCar&&url.startsWith("https://agreement.dahehuoyun.com/#/1ba5c216/912f4c9587/5eb5184653/6ef9")){ +// isOk = true; +// view.loadUrl(url); +// new MessageUtils().showSimCenPop(ctx, "个人信息上传成功，请添加车辆信息!", "去添加",() -> { +// Intent in = new Intent(ctx, CertificatesActivity.class); +// in.putExtra("index", 2); +// startActivity(in); +// ActivityUtils.finishToActivity(MainActivity.class,false); +// }); +// return true; +// } view.loadUrl(url); return true; } else if (uri.getScheme().equals("js") || uri.getScheme().equals("jsbridge")) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java index 0ba775a..673ad40 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/CertificatesActivity.java @@ -40,6 +40,7 @@ import com.arpa.hndahesudintocctmsdriver.util.PickerUtils; import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil; import com.arpa.hndahesudintocctmsdriver.util.alert.ToastUtil; import com.arpa.hndahesudintocctmsdriver.util.map.MapUtil; +import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; import com.bumptech.glide.request.target.Target; @@ -748,7 +749,7 @@ public class CertificatesActivity extends BaseAppCompatActivity { } }); - submit.setOnClickListener(v -> { + submit.setOnClickListener(new OnLimitClickHelper(v->{ if (!isAuth) { subimt(); } else { @@ -792,7 +793,7 @@ public class CertificatesActivity extends BaseAppCompatActivity { break; } } - }); + })); } @Override diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java new file mode 100644 index 0000000..ced3ebb --- /dev/null +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/FaceSuccActivity.java @@ -0,0 +1,51 @@ +package com.arpa.hndahesudintocctmsdriver.ui.auth; + +import android.content.Intent; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import androidx.annotation.Nullable; + +import com.arpa.hndahesudintocctmsdriver.R; +import com.arpa.hndahesudintocctmsdriver.ui.MainActivity; +import com.arpa.hndahesudintocctmsdriver.util.statusbar.StateStyleUtil; +import com.arpa.hndahesudintocctmsdriver.util.view.BaseAppCompatActivity; +import com.dahe.mylibrary.utils.ActivityUtils; + +/** + * @ClassName FaceSuccActivity + * @Author john + * @Date 2024/12/2 10:27 + * @Description TODO + */ +public class FaceSuccActivity extends BaseAppCompatActivity { + + @Override + protected void onCreate(@Nullable Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + StateStyleUtil.stateTextColor(this); + setContentView(R.layout.activity_face_succ_result); + con = this; + initView(null); + Button btnHome = findViewById(R.id.btnHome); + Button btnAddCar = findViewById(R.id.btnAddCar); + boolean isGoCar = getIntent().getBooleanExtra("isGoCar", false); + if (isGoCar){ + btnHome.setText("返回首页"); + btnAddCar.setVisibility(View.VISIBLE); + }else{ + btnHome.setText("返回"); + btnAddCar.setVisibility(View.GONE); + } + + btnHome.setOnClickListener(v -> finish()); + btnAddCar.setOnClickListener(v -> { + Intent in = new Intent(con, CertificatesActivity.class); + in.putExtra("index", 2); + startActivity(in); + finish(); + }); + + } +} diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java index c4538ae..6b4528c 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/auth/PhotoCarActivity.java @@ -3,6 +3,7 @@ package com.arpa.hndahesudintocctmsdriver.ui.auth; import android.content.Intent; import android.os.Bundle; import android.os.Message; +import android.text.InputType; import android.text.TextUtils; import android.util.Log; import android.view.View; @@ -110,8 +111,9 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl } if (CacheGroup.cacheList.get("ORCRoadLicZj") != null) { + if (customDialog != null && customDialog.isShowing()) + customDialog.dismiss(); OCRRoadBean ib = new Gson().fromJson(CacheGroup.cacheList.get("ORCRoadLicZj"), OCRRoadBean.class); - customDialog.dismiss(); if (ib.getCode() == 200 && ib.getData() != null&&!TextUtils.isEmpty(ib.getData().getLicenseNumber())) { value1.setText(PatternUtils.getNumByStr(ib.getData().getLicenseNumber())); } else { @@ -155,8 +157,10 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl } if (CacheGroup.cacheList.get("saveCarImg") != null) { - if (customDialog != null && customDialog.isShowing()) - customDialog.dismiss(); + if (type!=3){ + if (customDialog != null && customDialog.isShowing()) + customDialog.dismiss(); + } BaseBean bb = gson.fromJson(CacheGroup.cacheList.get("saveCarImg"), BaseBean.class); if (bb.getCode() == 200) { switch (type) { @@ -171,7 +175,7 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl break; case 3: ur.vehicleDelTwo(carId); - Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show(); +// Toast.makeText(con, "上传道路运输证成功", Toast.LENGTH_SHORT).show(); break; case 4: Toast.makeText(con, "交强险证件上传成功", Toast.LENGTH_SHORT).show(); @@ -635,8 +639,11 @@ public class PhotoCarActivity extends BaseAppCompatActivity implements View.OnCl tvSkip.setVisibility(isShowSkip[type] ? View.GONE : View.VISIBLE); llInfo.setVisibility(isShowEdit[type] ? View.VISIBLE : View.GONE); if (type == 4) { + value1.setInputType(InputType.TYPE_CLASS_TEXT); llDate.setVisibility(View.VISIBLE); title3.setText("保险公司"); + }else { + value1.setInputType(InputType.TYPE_CLASS_NUMBER); } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java index 182872e..9bc488a 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/home/HomeFragment.java @@ -68,6 +68,7 @@ import com.google.gson.Gson; import com.gyf.cactus.Cactus; import com.hjq.xtoast.XToast; import com.lxj.xpopup.XPopup; +import com.lxj.xpopup.core.BasePopupView; import com.lxj.xpopup.interfaces.OnConfirmListener; import com.arpa.hndahesudintocctmsdriver.R; import com.arpa.hndahesudintocctmsdriver.report.ALProcess; @@ -101,6 +102,7 @@ import com.arpa.hndahesudintocctmsdriver.util.http.RequsetCodeConstants; import com.arpa.hndahesudintocctmsdriver.util.time.Timer; import com.arpa.hndahesudintocctmsdriver.util.view.BaseFragment; import com.arpa.hndahesudintocctmsdriver.util.view.BaseRecyclerView; +import com.lxj.xpopup.interfaces.SimpleCallback; import com.permissionx.guolindev.PermissionX; import com.youth.banner.Banner; import com.youth.banner.BannerConfig; @@ -151,6 +153,8 @@ public class HomeFragment extends BaseFragment { private XToast xToast; + private boolean isUpAppShow = false; + @Override public void msgMethod(Message m) { @@ -239,6 +243,19 @@ public class HomeFragment extends BaseFragment { new XPopup.Builder(con) .dismissOnBackPressed(false) .dismissOnTouchOutside(false) + .setPopupCallback(new SimpleCallback() { + @Override + public void onShow(BasePopupView popupView) { + super.onShow(popupView); + isUpAppShow = true; + } + + @Override + public void onDismiss(BasePopupView popupView) { + super.onDismiss(popupView); + isUpAppShow = false; + } + }) .asCustom(new UpAppAlert(con, uab.getData().getDownloadUrl(), uab.getData().getContent(), uab.getData().getVersion(), uab.getData().getForce())) .show(); } @@ -258,8 +275,13 @@ public class HomeFragment extends BaseFragment { if (CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA) != null) { DriverAuthDataBean dad = gson.fromJson(CacheGroup.cacheList.get(WoDeFragment.AUTH_DATA), DriverAuthDataBean.class); if (dad.getCode() == 200) { + if (isUpAppShow) { + CacheGroup.cacheList.remove(WoDeFragment.AUTH_DATA); + return; + } + if (dad.getData() == null) { - new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！","去添加", () -> { + new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！", "去添加", () -> { Intent in = new Intent(con, CertificatesActivity.class); in.putExtra("index", 0); startActivity(in); @@ -268,19 +290,19 @@ public class HomeFragment extends BaseFragment { return; } if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getIdcard())) { - new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！", "去添加",() -> { + new MessageUtils().showSimCenPop(con, "该司机缺少身份证，未认证无法接单。是否去添加！", "去添加", () -> { Intent in = new Intent(con, CertificatesActivity.class); in.putExtra("index", 0); startActivity(in); }); } else if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getCardNo())) { - new MessageUtils().showSimCenPop(con, "该司机缺少银行卡，未认证无法接单。是否去添加！", "去添加",() -> { + new MessageUtils().showSimCenPop(con, "该司机缺少银行卡，未认证无法接单。是否去添加！", "去添加", () -> { Intent in333 = new Intent(con, UpBankActivity.class); in333.putExtra("type", 1); startActivity(in333); }); } else if (dad.getData() != null && TextUtils.isEmpty(dad.getData().getDriverLicense())) { - new MessageUtils().showSimCenPop(con, "该司机缺少驾驶证，未认证无法接单。是否去添加！", "去添加",() -> { + new MessageUtils().showSimCenPop(con, "该司机缺少驾驶证，未认证无法接单。是否去添加！", "去添加", () -> { Intent in = new Intent(con, CertificatesActivity.class); in.putExtra("index", 0); startActivity(in); @@ -1274,6 +1296,19 @@ public class HomeFragment extends BaseFragment { initView(null); } + @Override + public void onStart() { + super.onStart(); + refreshWaybills(); + } + + private void refreshWaybills() { +// if (UiAuxiliary.isLogin(con)) { +// int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1); +// hyr.startOrder(curWaybillId == -1 ? 0 : curWaybillId); +// } + } + @Subscribe public void processResult(HomeWaybillEvent home) { if (home.getMessage() == 1) { diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java index c559a1b..6aef659 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/login/LoginActivity.java @@ -33,6 +33,8 @@ import com.arpa.hndahesudintocctmsdriver.request.net.DataManager; import com.arpa.hndahesudintocctmsdriver.request.net.RxHttpCallBack; import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity; import com.arpa.hndahesudintocctmsdriver.util.NewLJUtils; +import com.arpa.hndahesudintocctmsdriver.util.alert.CustomDialog; +import com.arpa.hndahesudintocctmsdriver.weight.OnLimitClickHelper; import com.dahe.mylibrary.net.CommonResponseBean; import com.google.gson.Gson; import com.arpa.hndahesudintocctmsdriver.R; @@ -78,6 +80,7 @@ public class LoginActivity extends BaseActivity { private int timer_sum = 60; private CheckBox cb; private UserRequset ur; + private CustomDialog customDialog; @Override public void msgMethod(Message m) { @@ -96,6 +99,8 @@ public class LoginActivity extends BaseActivity { Log.e("--短信发送res--", "短信发送成功"); } if (CacheGroup.cacheList.get(LOGIN_RESULT) != null) { + if (customDialog!=null&&customDialog.isShowing()) + customDialog.dismiss(); //存储登录记录 loginBean = new Gson().fromJson(CacheGroup.cacheList.get(LOGIN_RESULT), LoginBean.class); Log.e("--登录信息--", new Gson().toJson(loginBean)); @@ -230,12 +235,14 @@ public class LoginActivity extends BaseActivity { } } }); - btn_login.setOnClickListener(v -> { + btn_login.setOnClickListener(new OnLimitClickHelper(v -> { String phone = String.valueOf(input_phone.getText()); String code = String.valueOf(input_code.getText()); Log.e("--code--", code); if (judgeFormat(phone, code)) { if (key) { + customDialog = new CustomDialog(con, "登陆中..."); + customDialog.show(); LoginRegInputBean lb = new LoginRegInputBean(); lb.setRoleId(4); lb.setUname(phone); @@ -247,7 +254,7 @@ public class LoginActivity extends BaseActivity { Toast.makeText(con, "请先同意用户协议和隐私政策", Toast.LENGTH_SHORT).show(); } } - }); + })); auto_login.setOnClickListener(v -> { JVerificationInterface.getToken(con, 20000, (i, s, s1) -> { JVerifyUIConfig uiConfig = new JVerifyUIConfig.Builder() diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java index c9c8902..2f571f4 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/MyFragment.java @@ -18,12 +18,14 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AppCompatActivity; +import com.arpa.hndahesudintocctmsdriver.bean.UpAppBean; import com.arpa.hndahesudintocctmsdriver.event.PersonEvent; import com.arpa.hndahesudintocctmsdriver.event.RefreshCarListEvent; import com.arpa.hndahesudintocctmsdriver.event.VehicleEvent; import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts; import com.arpa.hndahesudintocctmsdriver.parts.StartOrderParts; import com.arpa.hndahesudintocctmsdriver.parts.UserParts; +import com.arpa.hndahesudintocctmsdriver.ui.alert.UpAppAlert; import com.arpa.hndahesudintocctmsdriver.ui.business.BusinessActivity; import com.arpa.hndahesudintocctmsdriver.util.NewLJUtils; import com.arpa.hndahesudintocctmsdriver.util.PicturlUtil; @@ -95,6 +97,25 @@ public class MyFragment extends BaseFragment { } CacheGroup.cacheList.remove("userdata"); } + + if (CacheGroup.cacheList.get("up_app") != null) { + Log.e("up_app", CacheGroup.cacheList.get("up_app")); + UpAppBean uab = new Gson().fromJson(CacheGroup.cacheList.get("up_app"), UpAppBean.class); + if (uab.getCode() == 200) { + if (uab.getData() != null) { + new XPopup.Builder(con) + .dismissOnBackPressed(false) + .dismissOnTouchOutside(false) + .asCustom(new UpAppAlert(con, uab.getData().getDownloadUrl(), uab.getData().getContent(), uab.getData().getVersion(), uab.getData().getForce())) + .show(); + }else{ + Toast.makeText(con, "当前已经是最新版本", Toast.LENGTH_LONG).show(); + } + }else{ + Toast.makeText(con, uab.getMsg(), Toast.LENGTH_LONG).show(); + } + CacheGroup.cacheList.remove("up_app"); + } break; } } @@ -264,7 +285,10 @@ public class MyFragment extends BaseFragment { startActivity(in); }); //检查更新 - onUpdate.setOnClickListener(v -> Toast.makeText(con, "当前已经是最新版本", Toast.LENGTH_LONG).show()); + onUpdate.setOnClickListener(v -> { + ur.upApp(); + } + ); //系统设置 onSetUp.setOnClickListener(v -> startActivity(new Intent(con, SetupActivity.class))); } @@ -285,13 +309,13 @@ public class MyFragment extends BaseFragment { Glide.with(con).load(userBean.getData().getHeadportraitUrl()).into(img_head); } - if (userBean!=null){ - if ("0".equals(userBean.getData().getRealAuthentication())){ + if (userBean != null) { + if ("0".equals(userBean.getData().getRealAuthentication())) { no_auth.setVisibility(View.VISIBLE); - }else{ - if (100003 == userBean.getData().getAuditStatus()){ + } else { + if (100003 == userBean.getData().getAuditStatus()) { no_auth.setVisibility(View.GONE); - }else{ + } else { no_auth.setBackgroundResource(R.mipmap.icon_auth_wsh); } } diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java index 041408d..7581ec4 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/ui/my/SetupActivity.java @@ -13,6 +13,7 @@ import android.widget.Toast; import androidx.annotation.Nullable; import com.arpa.hndahesudintocctmsdriver.parts.ConfigParts; +import com.arpa.hndahesudintocctmsdriver.ui.web.WebOnlyOneActivity; import com.google.gson.Gson; import com.lxj.xpopup.XPopup; import com.arpa.hndahesudintocctmsdriver.R; @@ -94,19 +95,19 @@ public class SetupActivity extends BaseActivity { public void initView(Object obj) { super.initView(obj); r1.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con, WebOnlyOneActivity.class); in.putExtra("title","隐私政策"); in.putExtra("url",url2); startActivity(in); }); r2.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","用户协议"); in.putExtra("url",url1); startActivity(in); }); r3.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","运输安全责任书"); in.putExtra("url",url3); startActivity(in); @@ -121,7 +122,7 @@ public class SetupActivity extends BaseActivity { startActivity(in); }); r8.setOnClickListener(v12 -> { - Intent in=new Intent(con,WebActivity.class); + Intent in=new Intent(con,WebOnlyOneActivity.class); in.putExtra("title","交易规则"); in.putExtra("url","http://agreement.dahehuoyun.com/rule/transactionRules/dist/index.html#/"); startActivity(in); diff --git a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java index 46f97d3..00f5a7f 100644 --- a/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java +++ b/app/src/main/java/com/arpa/hndahesudintocctmsdriver/util/view/BaseRecyclerView.java @@ -105,6 +105,8 @@ public class BaseRecyclerView extends RecyclerView { ra.addItem(mb); } public void adds(List list){ + if (ra==null) + return; ra.add(list); } public AdapterAlls createsH(Context con, List list){ diff --git a/app/src/main/res/drawable-xxhdpi/face_success.png b/app/src/main/res/drawable-xxhdpi/face_success.png new file mode 100644 index 0000000..465e970 Binary files /dev/null and b/app/src/main/res/drawable-xxhdpi/face_success.png differ diff --git a/app/src/main/res/drawable/bg_btn_deepgreen16.xml b/app/src/main/res/drawable/bg_btn_deepgreen16.xml new file mode 100644 index 0000000..dac80e3 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_deepgreen16.xml @@ -0,0 +1,13 @@ + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/bg_btn_green16.xml b/app/src/main/res/drawable/bg_btn_green16.xml new file mode 100644 index 0000000..b006f86 --- /dev/null +++ b/app/src/main/res/drawable/bg_btn_green16.xml @@ -0,0 +1,9 @@ + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_face_succ_result.xml b/app/src/main/res/layout/activity_face_succ_result.xml new file mode 100644 index 0000000..b0855fe --- /dev/null +++ b/app/src/main/res/layout/activity_face_succ_result.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + +