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

[6.4.0]

Browse Source 
[taxi 面板 样式调整]
This commit is contained in:
yangyakun
2024-04-23 14:54:01 +08:00
parent 3008f2afcd
commit fb59927395
8 changed files with 12 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml
View File

@@ -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" />

4
OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml
View File

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

4
OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml
View File

@@ -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" />

8
OCH/facade/script/och.gradle
View File

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

24
OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -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
*/
}

2
OCH/taxi/driver/src/main/res/layout/taxi_being_order.xml
View File

@@ -268,7 +268,6 @@
<TextView
android:id="@+id/module_och_taxi_order_distance_anchor_3"
app:layout_constraintTop_toBottomOf="@+id/module_och_taxi_order_other_content_3"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="180dp"
@@ -277,6 +276,7 @@
android:text="距离 -- 公里，用时 -- 分钟"
android:textColor="#CAD6FF"
android:textSize="32dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="@+id/module_och_taxi_order_go_ahead_station_31"/>
</androidx.constraintlayout.widget.ConstraintLayout>

2
OCH/taxi/driver/src/main/res/layout/taxi_server_orders_panel.xml
View File

@@ -29,7 +29,7 @@
<androidx.viewpager.widget.ViewPager
android:id="@+id/module_och_taxi_view_pager"
android:layout_width="wrap_content"
android:layout_height="@dimen/dp_900"
android:layout_height="@dimen/dp_790"
android:paddingStart="@dimen/dp_29"
android:paddingEnd="@dimen/dp_29"
android:overScrollMode="never"

4
app/script/roleFlavors/driverpassenger.gradle
View File

@@ -9,11 +9,11 @@ project.android.productFlavors {
}
manifestPlaceholders = [
CHANNEL_VALUE_BODY : "Driver",
CHANNEL_VALUE_BODY : "DriverPassenger",
]
// ①标识
buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"Driver\""
buildConfigField 'String', 'APP_IDENTITY_MODE_BODY', "\"DriverPassenger\""
}
}