From 40f9ac00ec5e4d6363450d1c8e0b0937cc0b1de4 Mon Sep 17 00:00:00 2001
From: liugl <liugl@sinata.cn>
Date: 星期四, 14 一月 2021 10:50:18 +0800
Subject: [PATCH] 1。4:处理预约单导致串单的问题 隐藏预约单
---
app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java | 62 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 15 deletions(-)
diff --git a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
index f1ba686..00cf734 100644
--- a/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
+++ b/app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java
@@ -28,11 +28,16 @@
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;
+import com.okgoincar.utils.MyUtils;
import org.greenrobot.eventbus.EventBus;
import org.greenrobot.eventbus.Subscribe;
@@ -41,11 +46,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.
@@ -77,6 +85,7 @@
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
initParam();
+ MyUtils.getInstans().keepScreenLongLight(this,true);
EventBus.getDefault().register(this);
ActivityCollector.addActivity(this, getClass());
ActivityCollector.getActivityCollector().addActivity(this);
@@ -94,7 +103,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()){
@@ -107,7 +125,7 @@
// if (heartHandler == null) {
// heartHandler = new Handler(getMainLooper());
// }
-// heartHandler.postDelayed(this::settest,1000);
+// heartHandler.postDelayed(this::settest,2000);
}
@@ -139,22 +157,37 @@
}
- 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){
+ public void toDorderAct(String orderId, String orderType) {
+ MyApplication.Companion.getTTsManager().setVideoText("OK出行，有一条新的订单");
Intent intent = new Intent(this, SlabTripActivity.class);
- intent.putExtra("orderId",orderId);
- intent.putExtra("orderType",orderType);
+ intent.putExtra("orderId", orderId);
+ intent.putExtra("orderType", orderType);
startActivity(intent);
}
+ /***
+ * type 1:普通单 2：该派单
+ * @param orderId
+ * @param orderType
+ * @param time
+ * @param type
+ */
+ public void showOrder(String orderId, String orderType, int time, int type) {
+
+// UtilKtKt.calldetailOrderIsYy(this, orderId, orderType, b -> {
+// if (b) {
+ MyApplication.Companion.getTTsManager().setVideoText("OK出行，有一条新的订单");
+ 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("收到预约单");
+// }
+// });
+ }
@Override
@@ -199,7 +232,6 @@
} else {
startActivity(tClass);
}
-
}
public void startActivityResult(Class tClass, int code) {
--
Gitblit v1.7.1