android/OkGoinCar.git

			@@ -28,6 +28,8 @@

			import com.okgoincar.R;
			import com.okgoincar.base.BaseEvent;
			import com.okgoincar.base.MoneyBroadCastReceiver;
			import com.okgoincar.base.MyApplication;
			import com.okgoincar.slab.util.DialogUtil;
			import com.github.zackratos.ultimatebar.UltimateBar;
			import com.google.gson.Gson;
			@@ -41,11 +43,13 @@
			import java.util.List;

			import cn.sinata.xldutils.activitys.SlabBaseActivity;
			import cn.sinata.xldutils.netstatus.NetUtils;
			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.
			@@ -94,7 +98,15 @@

			}

			Handler heartHandler;
			@Override
			protected void onNetworkConnected(NetUtils.NetType type) {
			super.onNetworkConnected(type);
			if (NetUtils.isNetworkConnected(MyApplication.Companion.getInstance())) {
			MoneyBroadCastReceiver.Companion.callErrorOrder(this);
			}
			}

			// Handler heartHandler;
			private void settest() {
			// tv_test.setVisibility(VISIBLE);
			// if (!MyApplication.Companion.getLocation().getAoiName().isEmpty()){
			@@ -107,7 +119,7 @@
			// if (heartHandler == null) {
			// heartHandler = new Handler(getMainLooper());
			// }
			// heartHandler.postDelayed(this::settest,1000);
			// heartHandler.postDelayed(this::settest,2000);
			}


			@@ -139,14 +151,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);
			@@ -155,6 +159,22 @@
			startActivity(intent);
			}

			/***
			* type 1:普通单 2：该派单
			* @param orderId
			* @param orderType
			* @param time
			* @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);
			}



			@Override