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

[2.12.0] 1、增加到目的地导航按钮

Browse Source
This commit is contained in:
wangmingjun
2022-10-12 19:07:54 +08:00
parent de40f4c594
commit 30e68dca44
3 changed files with 32 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -81,12 +81,13 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
private LinearLayout mContentModule31;
private TextView mStationTv31;
private LinearLayout mContentModule32;
private ConstraintLayout mContentModule32;
private TextView mStationTv32;
private TextView mArrivedStationTitleTv32;
private TextView mGoAheadStationTitleTv31;
private TextView mCatchStationTitleTv31;
private ImageView mNaviIcon;
private ImageView mNaviToEndIcon;
private TextView mPassengerNum;
private TextView mPassengerPhone;
private ConstraintLayout mPassengerInfoLayout;
@@ -171,6 +172,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
private void initNaviView(View view) {
mNaviIcon = view.findViewById(R.id.module_och_taxi_navi_iv);
mNaviIcon.setOnClickListener(this);
mNaviToEndIcon = view.findViewById(R.id.module_och_taxi_navi_end_iv);
mNaviToEndIcon.setOnClickListener(this);
}
/**
@@ -384,6 +389,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
mDistanceAndTime3.setText(Html.fromHtml(strHtml2));
mNaviIcon.setVisibility(View.VISIBLE);
} else if (mContentModule2 != null && mContentModule2.getVisibility() == View.VISIBLE) { //前往终点 时间单位是分钟
mNaviIcon.setVisibility(View.VISIBLE);
if (mTtsLessThan200Tip < 1 && meters <= 250 && meters > 150){
speekVoice200mTipsOnce();
}
@@ -556,11 +562,13 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
} else if (v.getId() == R.id.module_och_taxi_order_cancel_iv) {
new TaxiOrderCancelDialog(mTaxiFragment, mActivity, mOrderNo, saveOrderState).show();
} else if (v.getId() == R.id.module_och_taxi_navi_iv) {
// TODO: 2021/11/30 打开去往乘客上车点的导航页面
if (mTaxiFragment != null) {
showNaviToStartStationFragment(true);
}
} else if (v.getId() == R.id.taxi_start_by_auto){//自驾模式
} else if (v.getId() == R.id.module_och_taxi_navi_end_iv){
// TODO: 2021/11/30 打开去往乘客下车点的导航页面
}else if (v.getId() == R.id.taxi_start_by_auto){//自驾模式
CallerLogger.INSTANCE.d(M_TAXI + TAG, "自驾模式");
mOrderStartModeBtn.setTag(0);
startOrEndService();

5
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java
View File

@@ -200,10 +200,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
if (null == beingServerdOrdersFragment) return;
beingServerdOrdersFragment.onCurrentOrderCancelDone();
}
public void onCurrentOrderDistToStartChanged(long meters, long timeInSecond){
if (null == beingServerdOrdersFragment) return;
beingServerdOrdersFragment.updateDistanceAndTime(meters,timeInSecond);
}
public void onCurrentOrderDistToEndChanged(long meters, long timeInSecond){
if (null == beingServerdOrdersFragment) return;
beingServerdOrdersFragment.updateDistanceAndTime(meters,timeInSecond);

24
OCH/mogo-och-taxi/src/main/res/layout/taxi_being_order.xml
View File

@@ -205,7 +205,7 @@
</LinearLayout>
<LinearLayout
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/module_och_taxi_order_arrive_station_32"
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -222,7 +222,9 @@
android:lineSpacingExtra="16px"
android:textColor="#CAD6FF"
android:textSize="30px"
tools:text="送乘客至" />
tools:text="送乘客至"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
<TextView
android:id="@+id/module_och_taxi_order_end_station_32"
android:layout_width="match_parent"
@@ -234,8 +236,22 @@
android:lineSpacingExtra="16px"
android:textColor="#FFFFFF"
android:textSize="42px"
tools:text="- -" />
</LinearLayout>
tools:text="- -"
app:layout_constraintTop_toBottomOf="@+id/arrive_station_32"
app:layout_constraintLeft_toLeftOf="parent"/>
<ImageView
android:id="@+id/module_och_taxi_navi_end_iv"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:src="@drawable/taxi_navi_icon"
android:visibility="gone"
android:layout_alignParentRight="true"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/module_och_taxi_order_end_station_32"
app:layout_constraintBottom_toBottomOf="@+id/module_och_taxi_order_end_station_32"/>
</androidx.constraintlayout.widget.ConstraintLayout>
<TextView
android:id="@+id/module_och_taxi_order_other_content_3"