From 59a89da95e7627c87dd01f00226d49104d1a93f3 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期二, 10 十一月 2020 16:03:03 +0800
Subject: [PATCH] 11.10 添加线上线下标记 ， 修改结束流程
---
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
index 5462b17..7ada0bb 100644
--- a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
+++ b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -30,9 +30,11 @@
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;
@@ -44,6 +46,7 @@
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;
@@ -102,6 +105,7 @@
protected void onNetworkConnected(NetUtils.NetType type) {
super.onNetworkConnected(type);
if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
+ toast("网络重新通畅");
MoneyBroadCastReceiver.Companion.callErrorOrder(this);
}
}
@@ -167,12 +171,18 @@
* @param type
*/
public void showOrder(String orderId, String orderType,int time,int type) {
- 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("收到预约单");
+ }
+ });
}
@@ -219,7 +229,6 @@
} else {
startActivity(tClass);
}
-
}
public void startActivityResult(Class tClass, int code) {
--
Gitblit v1.7.1