android/OkGoinCar.git

			@@ -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;

			@@ -167,12 +170,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("收到预约单");
			}
			});
			}

			@@ -23,7 +23,12 @@
			import cn.sinata.xldutils.utils.ViewClickDelay.hash
			import cn.sinata.xldutils.utils.ViewClickDelay.lastClickTime
			import cn.sinata.xldutils.xldUtils
			import com.google.gson.Gson
			import com.okgoincar.base.MyApplication
			import com.okgoincar.bean.OrderBean
			import com.okgoincar.netUtls.Api
			import com.okgoincar.netUtls.callNet
			import com.okgoincar.netUtls.getMapByAny
			import com.okgoincar.utils.Cache.CacheKey
			import org.jetbrains.anko.internals.AnkoInternals
			import java.lang.NumberFormatException
			@@ -335,6 +340,29 @@
			}
			}

			interface Isyy{
			fun isYy(b:Boolean)
			}

			fun calldetailOrderIsYy(context: Context,orderId:String,orderType:String,isyy: Isyy){
			var map = getMapByAny()
			map["orderId"] = orderId
			map["orderType"] = orderType
			map["lat"] = MyApplication.getLocation().latitude
			map["lon"] = MyApplication.getLocation().longitude
			callNet(context, Api.queryPushOrder, map) {
			val data = Gson().fromJson<OrderBean>(it, OrderBean::class.java).data
			data?.let {
			if(it.reservation != 2){
			isyy.isYy(true)
			}else{
			isyy.isYy(false)
			}

			}
			}
			}

			fun toast(s: String) {
			Toast.makeText(MyApplication.appContext, s, Toast.LENGTH_SHORT).show()
			}

	app/src/main/java/com/okgoincar/slab/MySlabBaseActivity.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/utils/UtilKt.kt	28 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史