From b0f715433a54c4bc897dd2bc86fa8ab70727b008 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 15 十二月 2020 18:05:13 +0800
Subject: [PATCH] 1:新增上线 6版
---
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java | 46 ++++++++++++++++++++++++++++------------------
1 files changed, 28 insertions(+), 18 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
index 2dac744..7ada0bb 100644
--- a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
+++ b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -28,10 +28,13 @@
import com.okgoincar.R;
import com.okgoincar.base.BaseEvent;
+import com.okgoincar.base.MoneyBroadCastReceiver;
import com.okgoincar.base.MyApplication;
+import com.okgoincar.netUtls.NetKitKt;
import com.okgoincar.slab.util.DialogUtil;
import com.github.zackratos.ultimatebar.UltimateBar;
import com.google.gson.Gson;
+import com.okgoincar.slab.util.UiUtil;
import com.okgoincar.utils.ActivityCollector;
import com.okgoincar.utils.EasePopup.EasyPopup;
@@ -42,11 +45,14 @@
import java.util.List;
import cn.sinata.xldutils.activitys.SlabBaseActivity;
+import cn.sinata.xldutils.netstatus.NetUtils;
+import cn.sinata.xldutils.utils.Isyy;
import cn.sinata.xldutils.utils.UtilKtKt;
import pub.devrel.easypermissions.EasyPermissions;
import static android.view.View.GONE;
import static android.view.View.VISIBLE;
+import static cn.sinata.xldutils.utils.UtilKtKt.toast;
/**
* Created by Administrator on 2018/1/16.
@@ -95,7 +101,16 @@
}
-// Handler heartHandler;
+ @Override
+ protected void onNetworkConnected(NetUtils.NetType type) {
+ super.onNetworkConnected(type);
+ if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
+ toast("网络重新通畅");
+ MoneyBroadCastReceiver.Companion.callErrorOrder(this);
+ }
+ }
+
+ // Handler heartHandler;
private void settest() {
// tv_test.setVisibility(VISIBLE);
// if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
@@ -140,14 +155,6 @@
}
- public void showOrder(String orderId, String orderType) {
-// Bundle bundle = creatBundleString("orderId", orderId);
-// bundle.putString("orderType", orderType);
- Intent intent = new Intent(this, SlabGetOrderFragment.class);
- intent.putExtra("orderId",orderId);
- intent.putExtra("orderType",orderType);
- startActivity(intent);
- }
public void toDorderAct(String orderId, String orderType){
Intent intent = new Intent(this, SlabTripActivity.class);
@@ -164,14 +171,18 @@
* @param type
*/
public void showOrder(String orderId, String orderType,int time,int type) {
-// Bundle bundle = creatBundleString("orderId", orderId);
-// bundle.putString("orderType", orderType);
- Intent intent = new Intent(this,SlabGetOrderFragment.class);
- intent.putExtra("orderId",orderId);
- intent.putExtra("orderType",orderType);
- intent.putExtra("time",time);
- intent.putExtra("type",type);
- startActivity(intent);
+ UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
+ if (b){
+ Intent intent = new Intent(MySlabBaseActivity.this,SlabGetOrderFragment.class);
+ intent.putExtra("orderId",orderId);
+ intent.putExtra("orderType",orderType);
+ intent.putExtra("time",time);
+ intent.putExtra("type",type);
+ startActivity(intent);
+ }else {
+// toast("收到预约单");
+ }
+ });
}
@@ -218,7 +229,6 @@
} else {
startActivity(tClass);
}
-
}
public void startActivityResult(Class tClass, int code) {
--
Gitblit v1.7.1