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

Merge remote-tracking branch 'origin/dev_MogoAP_eagle-220_211207_8.0.17_merge' into dev_MogoAP_eagle-220_211207_8.0.17_merge

Browse Source
This commit is contained in:
donghongyu
2022-03-01 16:53:00 +08:00
parent 591acbe443 f19841feb2
commit f3d97538a5
7 changed files with 65 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -51,13 +51,14 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
private ImageView ctvAutopilotStatusIv;
private TextView ctvAutopilotStatusTv;
protected TextView tvOperationStatus;
protected LinearLayout mSettingBtn;
protected RelativeLayout mSettingBtn;
protected ImageView mBadcaseBtn;
public boolean isOperationStatus;//false-收车，true-出车
private FrameLayout flStationPanelContainer;
private Group groupTestPanel;
private FrameLayout flSpeed;
private BusArcView mouduleArc;
private ImageView mUpgradeTipIv;
public static final String TYPE_ENTRANCE = "entrance";
@@ -207,6 +208,10 @@ public abstract class BaseOchBusTabFragment<V extends IView, P extends Presenter
return mBadcaseBtn; },
() -> { // onHide()
return null; });
//设置升级小红点提示 默认隐藏
mUpgradeTipIv = findViewById(R.id.module_och_bus_upgrade_red_tip);
CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv);
}
/**

12
OCH/mogo-och-bus/src/main/res/drawable/bus_setting_tip_red_cir_bg.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="26px" android:height="26px"/>
<corners android:radius="13px" />
<gradient
android:angle="225"
android:startColor="#FF0030"
android:endColor="#CF2E00"
android:type="linear" />
</shape>

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

@@ -124,7 +124,7 @@
app:layout_constraintBottom_toBottomOf="@+id/bus_switch_model_layout"
app:layout_constraintLeft_toRightOf="@+id/bus_switch_model_layout" />
<LinearLayout
<RelativeLayout
android:id="@+id/module_mogo_och_setting_layout"
android:layout_width="@dimen/module_mogo_och_operation_status_bg_width"
android:layout_height="@dimen/module_mogo_och_operation_status_bg_height"
@@ -132,16 +132,25 @@
android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
android:background="@drawable/bus_operation_status_bg"
android:elevation="@dimen/dp_10"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status">
<ImageView
android:id="@+id/module_och_bus_upgrade_red_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_gravity="right"
android:visibility="gone"
android:elevation="8px"
android:background="@drawable/bus_setting_tip_red_cir_bg" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_centerInParent="true"
android:background="@drawable/bus_setting_btn_bg" />
</LinearLayout>
</RelativeLayout>
<ImageView
android:id="@+id/module_mogo_och_badcase_iv"

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

@@ -12,12 +12,12 @@ import android.view.animation.LinearInterpolator;
import android.widget.FrameLayout;
import android.widget.ImageView;
import android.widget.LinearLayout;
import android.widget.RelativeLayout;
import android.widget.TextView;
import androidx.constraintlayout.widget.Group;
import androidx.fragment.app.FragmentTransaction;
import com.amap.api.navi.model.NaviLatLng;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.commons.mvp.IView;
@@ -38,9 +38,6 @@ 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，主要负责布局通用界面，处理站点面板和通话面板互斥情况
@@ -64,8 +61,9 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
private LinearLayout mMapswitchBtn;
private ImageView mCloseNaviIcon;
protected LinearLayout mPersonalBtn;
protected LinearLayout mSettingBtn;
protected RelativeLayout mSettingBtn;
protected ImageView mBadcaseBtn;
protected ImageView mUpgradeTipIv;
protected OCHNaviFragment ochNaviFragment = null;
private Handler mHandler = new Handler(Looper.getMainLooper());
@@ -141,6 +139,10 @@ public abstract class BaseOchTaxiTabFragment<V extends IView, P extends Presente
() -> { // onHide()
return null; });
//设置升级小红点提示 默认隐藏
mUpgradeTipIv = findViewById(R.id.module_och_taxi_upgrade_red_tip);
CallerHmiManager.INSTANCE.registerUpgradeTipsCallback(() -> mUpgradeTipIv);
panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer);
ctvAutopilotStatus.setOnClickListener(new OnPreventFastClickListener() {
@Override

12
OCH/mogo-och-taxi/src/main/res/drawable/taxi_setting_tip_red_cir_bg.xml Normal file
View File

@@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="oval">
<size android:width="22px" android:height="22px"/>
<corners android:radius="11px" />
<gradient
android:angle="225"
android:startColor="#FF0030"
android:endColor="#CF2E00"
android:type="linear" />
</shape>

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

@@ -124,7 +124,7 @@
</LinearLayout>
<LinearLayout
<RelativeLayout
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"
@@ -132,16 +132,26 @@
android:layout_marginBottom="@dimen/module_mogo_och_margin_bottom"
android:background="@drawable/taxi_operation_status_bg"
android:elevation="@dimen/dp_10"
android:gravity="center"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_och_taxi_personal_layout">
<ImageView
android:id="@+id/module_och_taxi_upgrade_red_tip"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_gravity="right"
android:visibility="gone"
android:elevation="8px"
android:background="@drawable/taxi_setting_tip_red_cir_bg" />
<ImageView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_centerInParent="true"
android:background="@drawable/taxi_setting_btn_bg" />
</LinearLayout>
</RelativeLayout>
<LinearLayout
android:id="@+id/module_och_taxi_swich_map_layout"

4
OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
View File

@@ -21,8 +21,8 @@
<dimen name="module_mogo_och_autopilot_status_bg_width">460px</dimen>
<dimen name="module_mogo_och_autopilot_status_bg_height">140px</dimen>
<dimen name="module_mogo_och_operation_status_bg_width">51dp</dimen>
<dimen name="module_mogo_och_operation_status_bg_height">51dp</dimen>
<dimen name="module_mogo_och_operation_status_bg_width">102px</dimen>
<dimen name="module_mogo_och_operation_status_bg_height">102px</dimen>
<dimen name="module_mogo_och_operation_status_padding">83px</dimen>