From fb599273954748c727fc21541e7b61cc416e751e Mon Sep 17 00:00:00 2001 From: yangyakun Date: Tue, 23 Apr 2024 14:54:01 +0800 Subject: [PATCH] =?UTF-8?q?[6.4.0]=20[taxi=20=E9=9D=A2=E6=9D=BF=20?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../biz_login_passenger_view_1080x1920.xml | 4 ++-- .../biz_login_passenger_view_1920x1080.xml | 4 ++-- .../biz_login_passenger_view_2560x1600.xml | 4 ++-- OCH/facade/script/och.gradle | 8 ------- .../ui/TaxiBeingServerdOrdersFragment.java | 24 ++----------------- .../src/main/res/layout/taxi_being_order.xml | 2 +- .../res/layout/taxi_server_orders_panel.xml | 2 +- app/script/roleFlavors/driverpassenger.gradle | 4 ++-- 8 files changed, 12 insertions(+), 40 deletions(-) diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml index 79e59e0d67..52a9ffc56e 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml @@ -17,7 +17,7 @@ android:gravity="center" android:layout_marginStart="@dimen/dp_160" android:layout_marginEnd="@dimen/dp_160" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/dp_30" app:layout_constraintBottom_toTopOf="@+id/actv_app_version" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -32,7 +32,7 @@ android:gravity="center" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_28" + android:textSize="@dimen/dp_30" app:layout_constraintStart_toStartOf="parent" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml index a4b699d5aa..f4b7455815 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml @@ -17,7 +17,7 @@ android:textColor="@color/white" android:layout_marginStart="@dimen/dp_160" android:layout_marginEnd="@dimen/dp_160" - android:textSize="@dimen/dp_24" + android:textSize="@dimen/dp_28" android:gravity="center" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" @@ -34,7 +34,7 @@ android:text="版本号:6.4.0" android:gravity="center" android:textColor="@color/white" - android:textSize="@dimen/dp_24" + android:textSize="@dimen/dp_28" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" diff --git a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml index f91f29185a..029ab548fe 100644 --- a/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml +++ b/OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml @@ -15,7 +15,7 @@ android:text="当前状态:连接司机屏中" android:textColor="@color/white" android:gravity="center" - android:textSize="@dimen/dp_26" + android:textSize="@dimen/dp_30" android:layout_marginStart="@dimen/dp_160" android:layout_marginEnd="@dimen/dp_160" app:layout_constraintBottom_toTopOf="@+id/actv_app_version" @@ -33,7 +33,7 @@ android:layout_marginEnd="@dimen/dp_160" android:text="版本号:6.4.0" android:textColor="@color/white" - android:textSize="@dimen/dp_26" + android:textSize="@dimen/dp_30" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" /> diff --git a/OCH/facade/script/och.gradle b/OCH/facade/script/och.gradle index 34d12a2126..f7e7d52d68 100644 --- a/OCH/facade/script/och.gradle +++ b/OCH/facade/script/och.gradle @@ -13,21 +13,16 @@ project.dependencies { implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("M1")) { - println "och.gradle---Driver---M1" implementation project.project(':OCH:charter:driver') } else if (isCurrentPassenger("M1")) { - println "och.gradle---Passenger---M1" implementation project.project(':OCH:charter:passenger') } else if (isCurrentDriver("B2")) { - println "och.gradle---Driver---B2" implementation project.project(':OCH:shuttle:driver') implementation project.project(':OCH:bus:driver') } else if (isCurrentPassenger("B2")) { - println "och.gradle---Passenger---B2" implementation project.project(':OCH:bus:passenger') implementation project.project(':OCH:shuttle:passenger') } else if (isCurrentDriver("T1T2")) { - println "och.gradle---Driver---T1T2" if(isCurrentDriver("saas")){ implementation project.project(':OCH:taxi:unmanned-driver') } @@ -35,13 +30,10 @@ project.dependencies { implementation project.project(':OCH:taxi:driver') } } else if (isCurrentPassenger("T1T2")) { - println "och.gradle---Passenger---T1T2" if(isCurrentPassenger("saas")){ - println "och.gradle---saasPassenger---T1T2" implementation project.project(':OCH:taxi:unmanned-passenger') } if(isCurrentPassenger("mogo")){ - println "och.gradle---mogoPassenger---T1T2" implementation project.project(':OCH:taxi:passenger') } } else { diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index 29744d131a..3cfe0bcdcd 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -149,7 +149,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment isHaveBeingOrder(false); //任意模式下调试信息都打开 - initOrderTestBar(view); + initOrderTestBar(); } private void initOnClickListener() { @@ -367,7 +367,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment * @param timeInSecond 秒 */ public void updateDistanceAndTime(long meters, long timeInSecond) { -// CallerLogger.d(M_TAXI + TAG,"meters = "+meters+"timeInSecond ="+timeInSecond); String dis = "0"; String disUnit = "公里"; if (meters > 0){ @@ -399,9 +398,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment } mDistanceAndTime2.setText(Html.fromHtml(strHtml2)); if (isFirstStartAutopilotDone){ -// VoiceNotice.showNotice(String.format(getResources() -// .getString(R.string.module_och_taxi_order_server_start_auto_tip), -// dis,disUnit,min)); isFirstStartAutopilotDone = false; } } @@ -412,7 +408,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment private void speekVoice200mTipsOnce() { mTtsLessThan200Tip = 1; - //VoiceNotice.showNotice(getResources().getString(R.string.module_och_taxi_order_arrive_end_200m_tip)); } public void onCurrentOrderRouteInfoGot(OrderQueryRouteInfoRespBean.Result routeInfo) {// 单位 米， 秒 @@ -519,7 +514,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment showOrHideNavi(false); setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.raw.star_marker); setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); - clearSmallMapRouteLine(); break; case ArriveAtStart: case UserArriveAtStart: @@ -536,11 +530,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); break; case OnTheWayToEnd: -// showNotice("欢迎使用蘑菇智行"); mOrderCancel.setVisibility(View.VISIBLE); -// double orderEndStationLat = order.endSiteGcjPoint.get(1); -// double orderEndStationLng = order.endSiteGcjPoint.get(0); -// startNaviToStation(false, orderEndStationLat, orderEndStationLng); if (mTaxiFragment != null) { showNaviToEndStationFragment(false); } @@ -554,7 +544,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment showOrHideNavi(false); setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,order.startSitePoint,R.raw.star_marker); setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); - clearSmallMapRouteLine(); break; case JourneyCompleted: mCurrentOrder = null; @@ -588,7 +577,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment mNoDataView.setVisibility(View.GONE); mBeingOrderLayout.setVisibility(View.VISIBLE); mTaxiFragment.changeOperationViewVisible(View.GONE); - clearSmallMapRouteLine(); } else { mNoDataView.setVisibility(View.VISIBLE); mNoDatasTv.setText("暂无进行中订单"); @@ -651,7 +639,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment setOrRemoveMapMaker(false, TaxiConst.TAXI_START_MAP_MAKER,mCurrentOrder.startSitePoint,R.raw.star_marker); setOrRemoveMapMaker(false, TaxiConst.TAXI_END_MAP_MAKER,mCurrentOrder.endSitePoint,R.raw.end_marker); } - clearSmallMapRouteLine(); //提交取消订单后的回调 ToastUtils.showShort("订单取消成功"); //更新界面 @@ -660,14 +647,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment clearOrderTag(); } - private void clearSmallMapRouteLine() { -// CallerSmpManager.clearPolyline(); - } - /** * 订单流转debug START */ - private void initOrderTestBar(View view) { + private void initOrderTestBar() { mOrderStatus.setOnLongClickListener(v -> { mTaxiFragment.clickTestBar(); return false; @@ -794,7 +777,4 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment background.setColor(bgColorId); mOrderServerStatus.setClickable(isClickable); } - /** - * END - */ } diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml index 38499281a8..f847e6b278 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml @@ -268,7 +268,6 @@ diff --git a/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml b/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml index 51041b17f6..2191961068 100644 --- a/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml +++ b/OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml @@ -29,7 +29,7 @@