diff --git a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt index 1c7d1a5654..0d0219dd1d 100644 --- a/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt +++ b/OCH/common/common/src/debug/java/com/mogo/och/common/module/debug/DebugDataDispatch.kt @@ -293,7 +293,7 @@ object DebugDataDispatch { newBuilder.heading = list.msg.GnssInfo.heading newBuilder.gnssSpeed = list.msg.GnssInfo.gnssSpeed CallerChassisGnssListenerManager.invokeChassisGnssListener(newBuilder.build()) - Thread.sleep(100) + Thread.sleep(50) } } catch (e: IOException) { e.printStackTrace() diff --git a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt index d0d1ba1721..a42f0cf7f2 100644 --- a/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt +++ b/OCH/common/common/src/test/java/com/mogo/och/common/module/ExampleUnitTest.kt @@ -40,8 +40,8 @@ class ExampleUnitTest { @Test fun resetDataOnlyOne(){ - val wgS84ToGCJ021 = CoordinateTransform.WGS84ToGCJ02(112.57734109982152,26.819824546720504) - val wgS84ToGCJ022 = CoordinateTransform.WGS84ToGCJ02(112.57299,26.90656) + val wgS84ToGCJ021 = CoordinateTransform.WGS84ToGCJ02(121.16223587817339,31.282241760977307) + val wgS84ToGCJ022 = CoordinateTransform.WGS84ToGCJ02(121.17099138155325,31.28418305918798) println("${wgS84ToGCJ021[1]},${wgS84ToGCJ021[0]}----1") println("${wgS84ToGCJ022[1]},${wgS84ToGCJ022[0]}----2") } diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt index c85830a99c..052e19fc76 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/unmanned/passenger/ui/orderinfo/ItineraryView.kt @@ -14,11 +14,8 @@ import androidx.lifecycle.ViewModelProvider import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.och.unmanned.taxi.passenger.R import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_arrived_time -import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance -import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_distance_unit import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_endstation -import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time -import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus_time_unit +import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.actv_surplus import kotlinx.android.synthetic.main.taxt_u_p_itinerary.view.progress_distance import me.jessyan.autosize.utils.AutoSizeUtils @@ -44,10 +41,26 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback } private fun setDrawable(normal:Boolean) { + + val corner = AutoSizeUtils.dp2px(context, 20f).toFloat() + val cornerTop = AutoSizeUtils.dp2px(context, 20f).toFloat() + + + + + + + val bottomColorEnd = ContextCompat.getColor(context, R.color.taxi_cp_80D4E4F0) + val bottomColorStart = ContextCompat.getColor(context, R.color.taxi_cp_A3C9EA) + + val temp01 = GradientDrawable() + temp01.cornerRadii = floatArrayOf(0f, 0f, 0f, 0f, corner, corner, corner, corner) + temp01.colors = intArrayOf(bottomColorStart, bottomColorEnd) + temp01.orientation = GradientDrawable.Orientation.LEFT_RIGHT + + val gradientDrawable = GradientDrawable() gradientDrawable.shape = GradientDrawable.RECTANGLE - val corner = AutoSizeUtils.dp2px(context, 40f).toFloat() - val cornerTop = AutoSizeUtils.dp2px(context, 20f).toFloat() if(normal) { gradientDrawable.cornerRadii = floatArrayOf(0f, 0f, cornerTop, cornerTop, cornerTop, cornerTop, corner, corner) @@ -55,20 +68,19 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback gradientDrawable.cornerRadii = floatArrayOf(0f, 0f, 0f, 0f, corner, corner, corner, corner) } + val firstColor = ContextCompat.getColor(context, R.color.taxi_p_0F5FFF) val setondColor = ContextCompat.getColor(context, R.color.taxi_p_44C8FF) val thirdColor = ContextCompat.getColor(context, R.color.taxi_p_8AE4ED) val fourceColor = ContextCompat.getColor(context, R.color.taxi_p_C8F3F4) - val bottomColor = ContextCompat.getColor(context, android.R.color.transparent) + gradientDrawable.colors = intArrayOf(firstColor, setondColor, thirdColor, fourceColor) gradientDrawable.orientation = GradientDrawable.Orientation.LEFT_RIGHT - - val temp01 = GradientDrawable() - temp01.cornerRadii = floatArrayOf(0f, 0f, 0f, 0f, corner, corner, corner, corner) - temp01.colors = intArrayOf(bottomColor, bottomColor) - val scaleDrawable3 = ScaleDrawable(gradientDrawable, Gravity.START, 1f, -1f) + + val arr = arrayOf(temp01, scaleDrawable3) + val ld = LayerDrawable(arr) ld.setDrawableByLayerId(android.R.id.background, temp01) ld.setDrawableByLayerId(android.R.id.progress, scaleDrawable3) @@ -101,12 +113,10 @@ class ItineraryView : ConstraintLayout, OrderInfoViewModel.ItineraryViewCallback surplusTime:String,surplusTimeUnit:String, arrivedTime:String,alreadyGone:Int,stationDistance:Int ){ - actv_distance.text = surplusdistance - actv_distance_unit.text = distanceUnit - actv_surplus_time .text= surplusTime - actv_surplus_time_unit.text = surplusTimeUnit actv_arrived_time.text= arrivedTime + actv_surplus.text = "剩余${surplusdistance}${distanceUnit}，${surplusTime}${surplusTimeUnit}" + if(stationDistance>0&&alreadyGone - + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml index 2eed9a7bf0..09178bef58 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_base_fragment.xml @@ -172,8 +172,8 @@ @@ -18,7 +18,7 @@ @@ -34,12 +34,12 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginEnd="@dimen/dp_12" - android:layout_marginStart="@dimen/dp_93" + android:layout_marginStart="@dimen/dp_71" + android:layout_marginTop="@dimen/dp_28" android:textColor="@color/taxi_p_004DC4" android:textSize="@dimen/dp_38" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="@+id/gl_horizontal_top" - app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center" android:text="前往" /> @@ -66,132 +65,49 @@ android:textSize="@dimen/dp_38" android:layout_marginEnd="@dimen/dp_8" app:layout_constraintEnd_toStartOf="@+id/actv_arrived_time" - app:layout_constraintTop_toTopOf="@+id/gl_horizontal_top" - app:layout_constraintBottom_toBottomOf="@+id/gl_horizontal_center" + app:layout_constraintBaseline_toBaselineOf="@+id/actv_endstation_title" android:text="到达" /> - - - - - - - - - - - - - - - - - - - - - - + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml index 6c546c9d69..a0468ca153 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/colors.xml @@ -87,7 +87,10 @@ #41444D #9EB0D3 - #009EB0D3 + + #80D4E4F0 + + #A3C9EA diff --git a/OCH/taxi/unmanned-passenger/src/main/res/values/strings.xml b/OCH/taxi/unmanned-passenger/src/main/res/values/strings.xml index 29fcc1a9a9..0c109a6297 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/values/strings.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/values/strings.xml @@ -37,9 +37,9 @@ 自动驾驶启动失败，请与司机确认车辆状态 车辆尚未完成准备，不能启动自动驾驶 - 距离(KM) - 距离(M) - 剩余(分) + 公里 + 米 + 分钟 亮度