android/OkGoinCar.git

			@@ -25,8 +25,8 @@
			applicationId "com.okgoincar"
			minSdkVersion 19
			targetSdkVersion 29
			versionCode 19
			versionName "19"
			versionCode 20
			versionName "20"
			multiDexEnabled true
			testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
			ndk {

			@@ -12,8 +12,8 @@
			// public static final int SOCKET_PORT = 9999;

			//外网
			public static final String BASE_URL = "https://okyueche:443/driver/";
			public static final String SOCKET_SERVER = "39.108.148.228";
			public static final String BASE_URL = "https://okyueche.com:443/driver/";
			public static final String SOCKET_SERVER = "39.108.122.38";
			public static final int SOCKET_PORT = 9999;
			public static final int SUCCESS = 200;

			@@ -125,7 +125,11 @@

			private fun showUI(data: UserInfoBean?) {
			data?.let {
			tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
			if (data.taxiAptitudeCard.length > 7){
			tv_code_num.text = data.taxiAptitudeCard.substring(0,3)+"**********"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)
			}else{
			tv_code_num.text = "资格证号：" + data.taxiAptitudeCard
			}
			tv_name.text = "姓名：" + it.name
			tv_car_num.text = "车牌：" + it.licensePlate
			recycler_view_start.layoutManager =

			@@ -99,7 +99,7 @@
			orderBean = gson.fromJson(it, OrderBean::class.java)
			showUi(orderBean)
			addSocketLisener(orderBean)
			checkOrderStatue()
			// checkOrderStatue()
			}
			}

			@@ -62,7 +62,6 @@
			MoneyBroadCastReceiver.callStatue(contexts, i)
			}


			/***
			* // 流程操作状态（3=开始出发预约点，4=到达预约点，5=开始服务，6=服务结束）
			* 页面一共4个marker 1：预约地点 2：起点 3终点 4：司机点
			@@ -448,7 +447,11 @@

			private fun showDriverUI(data: UserInfoBean?) {
			data?.let {
			tv_code_num.text = "证号：" + data.taxiAptitudeCard
			if (data.taxiAptitudeCard.length > 7){
			tv_code_num.text = data.taxiAptitudeCard.substring(0,3)+"**********"+data.taxiAptitudeCard.substring(data.taxiAptitudeCard.length-4,data.taxiAptitudeCard.length)
			}else{
			tv_code_num.text = "证号：" + data.taxiAptitudeCard
			}
			tv_name_car_man.text = "姓名：" + it.name
			tv_car_num_var.text = "车牌：" + it.licensePlate
			recycler_view_start.layoutManager =

	app/build.gradle	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/netUtls/Api.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabMainActivity.kt	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabOrderOverActivity.kt	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	app/src/main/java/com/okgoincar/slab/SlabTripActivity.kt	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史