diff --git a/app/build.gradle b/app/build.gradle index 8a0b27a..a78f818 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -105,7 +105,7 @@ android { JPUSH_CHANNEL: "developer-default"//暂时填写默认值即可. ] buildConfigField("String", "OPEN_AL_URL", "\"https://oapi-staging.alct56.com\"") - buildConfigField("String", "BASE_URL", "\"https://app.test.dahehuoyun.com/api/\"") + buildConfigField("String", "BASE_URL", "\"http://192.168.1.118:8080/api/\"") buildConfigField "boolean", "isTest", "true" //APP名称,可以在androidMainfest中引用 resValue "string", "appName", "司机测试" 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 65e5a2f..84df1d1 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 @@ -139,6 +139,8 @@ public class HomeFragment extends BaseFragment { private ImageConfig ic; private DriverExpireBean deb; + private XToast xToast; + @Override public void msgMethod(Message m) { @@ -278,8 +280,12 @@ public class HomeFragment extends BaseFragment { if (!TextUtils.isEmpty(deb.getData().getDriverLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getIdCardUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getQualificationUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getRoadLicenseUpdateUrl()) || !TextUtils.isEmpty(deb.getData().getInsuranceUpdateUrl())) { - new XToast<>(act) - .setContentView(R.layout.view_bc) + if (xToast==null){ + xToast = new XToast(act); + }else if (xToast!=null&&xToast.isShow()){ + xToast.cancel(); + } + xToast.setContentView(R.layout.view_bc) // 设置成可拖拽的 .setDraggable() // 设置显示时长 @@ -294,6 +300,22 @@ public class HomeFragment extends BaseFragment { // 设置窗口背景阴影强度 //.setBackgroundDimAmount(0.5f) .showAsDropDown(home_top, Gravity.BOTTOM, 1200, 1000); +// new XToast<>(act) +// .setContentView(R.layout.view_bc) +// // 设置成可拖拽的 +// .setDraggable() +// // 设置显示时长 +// .setDuration(1000 * 60 * 60 * 12) +// .setOnClickListener(R.id.img_kf, (toast, view) -> { +// toast.startActivity(in); +// Log.e("-is-", view.isInTouchMode() + ""); +// }) +// // 设置动画样式 +// //.setAnimStyle(android.R.style.Animation_Translucent) +// // 设置外层是否能被触摸 +// // 设置窗口背景阴影强度 +// //.setBackgroundDimAmount(0.5f) +// .showAsDropDown(home_top, Gravity.BOTTOM, 1200, 1000); } CacheGroup.cacheList.remove("driverExpire"); } @@ -688,14 +710,14 @@ public class HomeFragment extends BaseFragment { WalletRequest qr = new WalletRequest(con, hd); if (UiAuxiliary.isLogin(con)) { -// int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1); + int curWaybillId = (int) SPUtils.get(con, "curWaybillId", -1); ur.User(); if (!OneDayShowUtils.getInstance().todayIsShow(con)) { qr.getBankCardList(); } ur.getDriverExpire(); -// hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId); - hyr.startOrder(0); + hyr.startOrder(curWaybillId==-1 ? 0 : curWaybillId); +// hyr.startOrder(0); ur.driverAuthData(); } // oldTime= Calendar.getInstance().getTimeInMillis();