yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[3.4.0]

Browse Source 
[行程信息]
This commit is contained in:
yangyakun
2023-07-13 17:00:17 +08:00
parent 70ac18f9af
commit b82425bcea
7 changed files with 206 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt
View File

@@ -90,8 +90,10 @@ class TaxiPassengerBaseFragment() :
}
if(selectItem == BottomBar.SelectView.PRECISIONMAP){
mapBizView.visibility = View.VISIBLE
itinerary.visibility = View.VISIBLE
}else{
mapBizView.visibility = View.GONE
itinerary.visibility = View.GONE
}
}
})

26
OCH/mogo-och-taxi-passenger/src/main/res/drawable/taxi_power_size_seekbar_style.xml Normal file
View File

@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
<layer-list
xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@android:id/background">
<shape>
<corners android:bottomLeftRadius="@dimen/dp_20" android:bottomRightRadius="@dimen/dp_20"/>
<solid android:color="@color/taxi_p_476FBE" />
</shape>
</item>
<item android:id="@android:id/secondaryProgress">
<clip>
<shape>
<corners android:bottomLeftRadius="@dimen/dp_20" android:bottomRightRadius="@dimen/dp_20"/>
<solid android:color="@color/taxi_p_476FBE" />
</shape>
</clip>
</item>
<item android:id="@android:id/progress">
<scale android:scaleWidth="100%">
<shape android:shape="rectangle">
<corners android:bottomLeftRadius="@dimen/dp_20" android:bottomRightRadius="@dimen/dp_10" android:topRightRadius="@dimen/dp_10"/>
<gradient android:startColor="@color/taxi_p_6edbdc" android:endColor="@color/taxi_p_56efa0" android:angle="0"/>
</shape>
</scale>
</item>
</layer-list>

21
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_base_fragment.xml
View File

@@ -35,12 +35,13 @@
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_marginStart="@dimen/dp_557"
android:layout_marginBottom="50dp"
android:layout_marginTop="100dp"
android:background="@drawable/roma_taxi_p_bg_selector"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:roma_close="@drawable/roma_taxi_p_bg_selector"
app:roma_open="@drawable/iv_roma_taxi_passenger_press_bg"
app:layout_constraintLeft_toLeftOf="parent" />
/>
<!-- 红绿灯 -->
<com.mogo.eagle.core.function.hmi.ui.widget.SingleTrafficLightView
@@ -53,25 +54,21 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<!-- 全览地图 -->
<FrameLayout
android:id="@+id/fl_container_overview"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<!-- 路程信息 -->
<com.mogo.och.taxi.passenger.ui.orderinfo.ItineraryView
android:id="@+id/itinerary"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintBottom_toTopOf="@+id/bottom"
android:layout_width="@dimen/dp_200"
android:layout_height="@dimen/dp_100"/>
android:layout_marginStart="@dimen/dp_48"
android:layout_marginBottom="@dimen/dp_42"
android:layout_width="@dimen/dp_726"
android:layout_height="wrap_content"/>
<!-- 底部导航栏 -->
<com.mogo.och.taxi.passenger.ui.bottom.BottomBar
android:id="@+id/bottom"
app:layout_constraintBottom_toBottomOf="parent"
android:layout_width="match_parent"
android:layout_height="wrap_content"/>
android:layout_height="@dimen/dp_160"/>
</androidx.constraintlayout.widget.ConstraintLayout>

11
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_bottom_bar.xml
View File

@@ -2,18 +2,23 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="@dimen/dp_107"
android:layout_height="@dimen/dp_160"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"
tools:ignore="MissingDefaultResource">
<TextClock
android:id="@+id/cl_order_time"
android:format12Hour="MM月dd日 HH:mm"
android:format24Hour="MM月dd日 HH:mm"
android:format12Hour="M月d日 HH:mm"
android:format24Hour="M月d日 HH:mm"
android:gravity="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:textColor="@color/taxi_p_111D2F"
android:textSize="@dimen/dp_52"
android:layout_marginStart="@dimen/dp_120"
android:letterSpacing="-0.05"
android:layout_width="wrap_content"
android:layout_height="match_parent"/>

195
OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_itinerary.xml
View File

@@ -2,73 +2,166 @@
<merge xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
tools:layout_height="wrap_content"
tools:layout_width="wrap_content"
android:layout_width="@dimen/dp_726"
android:layout_height="wrap_content"
tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_endstation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
<View
app:layout_constraintTop_toTopOf="parent"
tools:text="目的地" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_distance"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="剩余距离" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="剩余距离单位" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_surplus_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="剩余时间" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_surplus_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="剩余时间单位"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_arrived_time"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="到达时间"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" />
app:layout_constraintBottom_toBottomOf="@+id/progress"
android:background="@color/taxi_p_A7BDF3"
android:layout_marginTop="@dimen/dp_88"
android:layout_width="@dimen/dp_726"
android:layout_height="0dp"/>
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_speed_value"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintEnd_toEndOf="parent"
android:layout_marginStart="@dimen/dp_32"
android:textColor="@color/taxi_p_203555"
android:textSize="@dimen/dp_150"
android:textScaleX="0.9"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="速度" />
android:text="68" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_speed_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/taxi_p_203555"
android:textSize="@dimen/dp_35"
app:layout_constraintBaseline_toBaselineOf="@+id/actv_speed_value"
app:layout_constraintStart_toEndOf="@+id/actv_speed_value"
android:layout_marginStart="@dimen/dp_24"
android:text="KM/h" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_endstation"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_32"
android:maxLength="10"
android:maxLines="1"
android:textColor="@color/taxi_p_293449"
android:textSize="@dimen/dp_35"
app:layout_constraintBottom_toBottomOf="@+id/actv_speed_unit"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:text="速度单位" />
app:layout_constraintTop_toTopOf="@+id/actv_speed_unit"
android:text="环球贸易中心" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_endstation_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="@dimen/dp_12"
android:textColor="@color/taxi_p_004DC4"
android:textSize="@dimen/dp_35"
app:layout_constraintBottom_toBottomOf="@+id/actv_speed_unit"
app:layout_constraintEnd_toStartOf="@+id/actv_endstation"
app:layout_constraintTop_toTopOf="@+id/actv_speed_unit"
android:text="前往" />
<View
android:layout_width="0dp"
android:layout_height="1dp"
android:background="@color/taxi_p_5C71AB"
app:layout_constraintEnd_toEndOf="@+id/actv_endstation"
app:layout_constraintStart_toStartOf="@+id/actv_speed_value"
app:layout_constraintTop_toBottomOf="@+id/actv_speed_value" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_distance"
android:layout_width="0dp"
android:gravity="center"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/dp_51"
android:textSize="@dimen/dp_61"
app:layout_constraintHorizontal_chainStyle="spread"
android:textColor="@color/taxi_p_081831"
app:layout_constraintEnd_toStartOf="@+id/actv_surplus_time"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/actv_speed_value"
android:text="12" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_distance_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/taxi_p_112B57"
android:textSize="@dimen/dp_33"
app:layout_constraintTop_toBottomOf="@+id/actv_distance"
app:layout_constraintStart_toStartOf="@+id/actv_distance"
app:layout_constraintEnd_toEndOf="@+id/actv_distance"
app:layout_constraintBottom_toTopOf="@+id/progress"
android:layout_marginBottom="@dimen/dp_57"
android:text="剩余(分)" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_surplus_time"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="@dimen/dp_61"
android:textColor="@color/taxi_p_081831"
app:layout_constraintEnd_toStartOf="@+id/actv_arrived_time"
app:layout_constraintStart_toEndOf="@+id/actv_distance"
app:layout_constraintTop_toTopOf="@+id/actv_distance"
android:text="23.6" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_surplus_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/taxi_p_112B57"
android:textSize="@dimen/dp_33"
android:text="距离(KM)"
app:layout_constraintTop_toBottomOf="@+id/actv_surplus_time"
app:layout_constraintStart_toStartOf="@+id/actv_surplus_time"
app:layout_constraintEnd_toEndOf="@+id/actv_surplus_time" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_arrived_time"
android:layout_width="0dp"
android:gravity="center"
android:layout_height="wrap_content"
android:textSize="@dimen/dp_61"
android:textColor="@color/taxi_p_081831"
android:text="15:05"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/actv_surplus_time"
app:layout_constraintTop_toTopOf="@+id/actv_distance" />
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/actv_arrived_time_unit"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/taxi_p_112B57"
android:textSize="@dimen/dp_33"
android:text="到达"
app:layout_constraintTop_toBottomOf="@+id/actv_arrived_time"
app:layout_constraintStart_toStartOf="@+id/actv_arrived_time"
app:layout_constraintEnd_toEndOf="@+id/actv_arrived_time" />
<ProgressBar
android:id="@+id/progress"
style="?android:attr/progressBarStyleHorizontal"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
android:progress="20"
android:maxHeight="@dimen/dp_10"
android:minHeight="@dimen/dp_10"
android:background="@null"
android:progressDrawable="@drawable/taxi_power_size_seekbar_style" />
</merge>

15
OCH/mogo-och-taxi-passenger/src/main/res/values/colors.xml
View File

@@ -56,4 +56,19 @@
<color name="taxi_p_video_unit">#8FB3EF</color>
<color name="taxi_p_video_gradient_start">#E1F3FE</color>
<color name="taxi_p_video_gradient_end">#FFFFFF</color>
<color name="taxi_p_111D2F">#111D2F</color>
<color name="taxi_p_004DC4">#004DC4</color>
<color name="taxi_p_293449">#293449</color>
<color name="taxi_p_203555">#203555</color>
<color name="taxi_p_5C71AB">#5C71AB</color>
<color name="taxi_p_081831">#081831</color>
<color name="taxi_p_112B57">#112B57</color>
<color name="taxi_p_476FBE">#476FBE</color>
<color name="taxi_p_6edbdc">#6edbdc</color>
<color name="taxi_p_56efa0">#56efa0</color>
<color name="taxi_p_A7BDF3">#A7BDF3</color>
</resources>

6
app/src/main/java/com/mogo/launcher/startup/ConfigStartUp.kt
View File

@@ -120,10 +120,8 @@ object ConfigStartUp {
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式
FunctionBuildConfig.skinMode = 1
} else if (AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
} else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)) {
} else if (AppIdentityModeUtils.isCharter(FunctionBuildConfig.appIdentityMode)||
AppIdentityModeUtils.isTaxi(FunctionBuildConfig.appIdentityMode)) {
//是否显示 限速UI
HmiBuildConfig.isShowLimitingVelocityView = false
//白天模式