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

[Bus/TaxiDriver v2.5.1]OCH: 增加badcase入口

Browse Source
This commit is contained in:
pangfan
2022-02-16 11:24:55 +08:00
parent 107d5f7d90
commit 7ae2d6c05a
6 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseOchBusTabFragment.java
View File

@@ -52,6 +52,7 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
private TextView ctvAutopilotStatusTv;
protected TextView tvOperationStatus;
protected LinearLayout mSettingBtn;
protected ImageView mBadcaseBtn;
public boolean isOperationStatus;//false-收车，true-出车
private FrameLayout flStationPanelContainer;
private Group groupTestPanel;
@@ -198,6 +199,18 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
// TODO: 2021/12/9
CallerHmiManager.INSTANCE.showToolsView();
});
mBadcaseBtn = findViewById(R.id.module_mogo_och_badcase_iv);
mBadcaseBtn.setOnClickListener(v -> {
CallerHmiManager.INSTANCE.showBadCaseEntrance(mBadcaseBtn);
});
CallerHmiManager.INSTANCE.registerBadCaseCallback(
() -> { // onShow()
mBadcaseBtn.setVisibility(View.VISIBLE);
return null; },
() -> { // onHide()
mBadcaseBtn.setVisibility(View.GONE);
return null; });
}
/**

BIN
OCH/mogo-och-bus/src/main/res/drawable-xhdpi-2560x1440/bus_badcase_btn_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

13
OCH/mogo-och-bus/src/main/res/layout/bus_base_fragment.xml
View File

@@ -141,9 +141,20 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/bus_setting_btn_bg" />
</LinearLayout>
<ImageView
android:id="@+id/module_mogo_och_badcase_iv"
android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
android:layout_marginLeft="@dimen/module_mogo_och_margin_left"
android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
android:src="@drawable/bus_badcase_btn_bg"
android:elevation="@dimen/dp_10"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_setting_layout"/>
<com.mogo.och.bus.view.SlidePanelView
android:id="@+id/module_mogo_och_slide_panel"
android:layout_width="wrap_content"

17
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseOchTaxiTabFragment.java
View File

@@ -38,6 +38,9 @@ import com.mogo.module.common.constants.DataTypes;
import com.mogo.module.common.view.OnPreventFastClickListener;
import com.mogo.och.taxi.R;
import kotlin.Unit;
import kotlin.jvm.functions.Function0;
/**
* 网约车基础Fragment，主要负责布局通用界面，处理站点面板和通话面板互斥情况
@@ -62,6 +65,7 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
private ImageView mCloseNaviIcon;
protected LinearLayout mPersonalBtn;
protected LinearLayout mSettingBtn;
protected ImageView mBadcaseBtn;
protected OCHNaviFragment ochNaviFragment = null;
private Handler mHandler = new Handler(Looper.getMainLooper());
@@ -128,6 +132,19 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
// TODO: 2021/12/9
CallerHmiManager.INSTANCE.showToolsView();
});
mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_iv);
mBadcaseBtn.setOnClickListener(v -> {
CallerHmiManager.INSTANCE.showBadCaseEntrance(mBadcaseBtn);
});
CallerHmiManager.INSTANCE.registerBadCaseCallback(
() -> { // onShow()
mBadcaseBtn.setVisibility(View.VISIBLE);
return null; },
() -> { // onHide()
mBadcaseBtn.setVisibility(View.GONE);
return null; });
panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer);
ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() {
@Override

BIN
OCH/mogo-och-taxi/src/main/res/drawable-xhdpi-2560x1440/taxi_badcase_btn_bg.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 10 KiB

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

@@ -127,7 +127,7 @@
</LinearLayout>
<LinearLayout
android:id="@+id/module_och_taxi_swich_map_layout"
android:id="@+id/module_och_taxi_setting_layout"
android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
android:layout_marginLeft="40px"
@@ -142,12 +142,11 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/taxi_switch_map_bg" />
android:background="@drawable/taxi_setting_btn_bg" />
</LinearLayout>
<LinearLayout
android:id="@+id/module_och_taxi_setting_layout"
android:id="@+id/module_och_taxi_swich_map_layout"
android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
android:layout_marginLeft="40px"
@@ -156,15 +155,26 @@
android:elevation="@dimen/dp_10"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout">
app:layout_constraintLeft_toRightOf="@id/module_och_taxi_setting_layout">
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:background="@drawable/taxi_setting_btn_bg" />
android:background="@drawable/taxi_switch_map_bg" />
</LinearLayout>
<ImageView
android:id="@+id/module_och_taxi_badcase_iv"
android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
android:layout_marginLeft="40px"
android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
android:src="@drawable/taxi_badcase_btn_bg"
android:elevation="@dimen/dp_10"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_och_taxi_swich_map_layout"/>
<Button
android:id="@+id/btnAutopilotDisable"