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

[2.13.0] taxi个人中心调整

Browse Source
This commit is contained in:
wangmingjun
2022-11-22 20:56:43 +08:00
parent 0c0ff743bb
commit a15ba31cef
17 changed files with 176 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
View File

@@ -120,8 +120,10 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
@Subscribe(threadMode = ThreadMode.MAIN)
public void changeOverview(EventLogout eventLogout){
CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
mPresenter.logout();
if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
CallerLogger.INSTANCE.d(M_BUS + TAG,"changeOverview Event消息去登出");
mPresenter.logout();
}
}
@Override

4
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt
View File

@@ -10,8 +10,8 @@ import com.mogo.och.common.module.biz.common.socketmessage.data.OCHOperationalMe
* 统一管理业务长链消息推送
*/
object OCHSocketMessageManager {
public val msgMonitorType:Int = 0X0601001
public val msgWriteOffPassengerType:Int = 0X0601002
public val msgMonitorType:Int = 6295553
public val msgWriteOffPassengerType:Int = 6295554
fun <T> registerSocketMessageListener(msgType:Int,
mogoOnMessageListener :IMogoOnMessageListener<T>){

2
OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt
View File

@@ -5,6 +5,6 @@ package com.mogo.och.common.module.biz.common.socketmessage.data
*/
data class OCHOperationalMessage (
var message: String = "" ,//运营消息
var messageType: Int = 0, // 运营消息类型
var messageType: Int = 0, // 运营消息类型，目前没有用处，后台也没返回
var pushTimeStamp: Long = System.currentTimeMillis() // 消息下发时间戳
)

7
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java → OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java
View File

@@ -1,12 +1,17 @@
package com.mogo.och.taxi.callback;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import java.util.List;
/**
* Created on 2021/9/8
*
* Model->Presenter回调：接单车状态变更 登录状态变更
*/
public interface ITaxiCarStatusCallback {
public interface ITaxiCarOperationalCallback {
void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum);
void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList);
}

3
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java
View File

@@ -31,9 +31,6 @@ public interface ITaxiOrderStatusCallback {
// 当前位置距离上车点的距离（米）、预估时间（秒）
void onCurrentOrderDistToEndChanged(long meters, long timeInSecond);
// 获取全部订单列表（含已完成、已取消）的反馈
void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList);
// 新到预约单
void onNewBookingOrderGot(OrderQueryRespBean.Result order);

17
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -66,7 +66,7 @@ import com.mogo.och.taxi.bean.TaxiDataBaseRespBean;
import com.mogo.och.taxi.bean.TaxiOrPassengerReadyReqBean;
import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback;
import com.mogo.och.taxi.callback.ITaxiADASStatusCallback;
import com.mogo.och.taxi.callback.ITaxiCarStatusCallback;
import com.mogo.och.taxi.callback.ITaxiCarOperationalCallback;
import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;
import com.mogo.och.taxi.constant.TaxiConst;
@@ -76,7 +76,6 @@ import com.mogo.och.taxi.constant.TaxtServingStatusManager;
import com.mogo.och.taxi.network.TaxiServiceManager;
import com.mogo.och.taxi.utils.TaxiAnalyticsManager;
import com.mogo.och.taxi.utils.OrderUtil;
import com.mogo.aicloud.services.socket.IMogoLifecycleListener;
import com.mogo.och.taxi.utils.TaxiTrajectoryManager;
import com.zhjt.service.chain.ChainLog;
import com.zhjt.service.chain.TracingConstants;
@@ -121,7 +120,7 @@ public class TaxiModel {
private volatile List<OrderQueryRespBean.Result> mWaitServiceList = Collections.emptyList(); //待服务订单
private ITaxiADASStatusCallback mADASStatusCallback; //Model->Presenter：自动驾驶状态相关
private ITaxiCarStatusCallback mCarStatusCallback; //Model->Presenter：接单状态、登录状态和司机今日接单状态
private ITaxiCarOperationalCallback mCarOperationalCallback; //Model->Presenter：登录状态和司机今日接单状态
private ITaxiControllerStatusCallback mControllerStatusCallback; //Model->Presenter：VR mode等
private ITaxiOrderStatusCallback mOrderStatusCallback; //Model->Presenter：订单变更
private IOCHTaxiAutopilotPlanningCallback mAutopilotPlanningCallback;
@@ -146,8 +145,8 @@ public class TaxiModel {
this.mADASStatusCallback = callback;
}
public void setCarStatusCallback(ITaxiCarStatusCallback callback) {
this.mCarStatusCallback = callback;
public void setCarStatusCallback(ITaxiCarOperationalCallback callback) {
this.mCarOperationalCallback = callback;
}
public void setControllerStatusCallback(ITaxiControllerStatusCallback callback) {
@@ -517,8 +516,8 @@ public class TaxiModel {
@Override
public void onSuccess(OrdersListQueryRespBean data) {
if (null != data && 0 == data.code) {
if (mOrderStatusCallback != null) {
mOrderStatusCallback.onOrdersListPageRefresh(data.data.orders);
if (mCarOperationalCallback != null) {
mCarOperationalCallback.onOrdersListPageRefresh(data.data.orders);
}
}
}
@@ -704,8 +703,8 @@ public class TaxiModel {
public void onSuccess(DriverServiceDataRespBean data) {
if (data != null && data.code == 0
&& data.data != null) {
if (mCarStatusCallback != null) {
mCarStatusCallback.onServiceDataUpdate(
if (mCarOperationalCallback != null) {
mCarOperationalCallback.onServiceDataUpdate(
data.data.timeDuration, data.data.orderNum);
}
}

64
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java Normal file
View File

@@ -0,0 +1,64 @@
package com.mogo.och.taxi.presenter;
import android.os.Looper;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.callback.ITaxiCarOperationalCallback;
import com.mogo.och.taxi.model.TaxiModel;
import com.mogo.och.taxi.ui.TaxiPersonalDialogFragment;
import java.util.List;
import androidx.annotation.NonNull;
import androidx.lifecycle.LifecycleOwner;
public class TaxiOperationalPresenter extends Presenter<TaxiPersonalDialogFragment>
implements ITaxiCarOperationalCallback {
public TaxiOperationalPresenter(TaxiPersonalDialogFragment view) {
super(view);
initListener();
}
private void initListener() {
TaxiModel.getInstance().setCarStatusCallback(this);
}
private void releaseListener(){
TaxiModel.getInstance().setCarStatusCallback(null);
}
@Override
public void onDestroy(@NonNull LifecycleOwner owner) {
super.onDestroy(owner);
releaseListener();
}
// 获取全部订单列表
public void queryOrdersList(int page, int size) {
TaxiModel.getInstance().queryOrdersList(page, size);
}
@Override
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum) {
runOnUIThread(() -> mView.onServiceDataUpdate(dailyTimeDuration,dailyOrderNum));
}
@Override
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList) {
runOnUIThread(() -> mView.onOrdersListPageRefresh(ordersList));
}
private void runOnUIThread( Runnable executor ) {
if ( executor == null ) {
return;
}
if ( Looper.myLooper() != Looper.getMainLooper() ) {
UiThreadHandler.post( executor );
} else {
executor.run();
}
}
}

27
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java
View File

@@ -10,7 +10,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.RequiresApi;
import androidx.lifecycle.LifecycleOwner;
import com.amap.api.maps.model.LatLng;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.commons.mvp.Presenter;
import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
@@ -20,14 +19,12 @@ import com.mogo.och.common.module.biz.bean.DriverStatusQueryRespBean;
import com.mogo.och.common.module.biz.callback.ILoginCallback;
import com.mogo.och.common.module.biz.constant.LoginStatusManager;
import com.mogo.och.common.module.manager.OCHAdasAbilityManager;
import com.mogo.och.taxi.callback.IOCHTaxiAutopilotPlanningCallback;
import com.mogo.och.taxi.constant.TaxiConst;
import com.mogo.och.taxi.constant.TaxiDriverRoleEnum;
import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
import com.mogo.och.taxi.callback.ITaxiADASStatusCallback;
import com.mogo.och.taxi.callback.ITaxiCarStatusCallback;
import com.mogo.och.taxi.callback.ITaxiControllerStatusCallback;
import com.mogo.och.taxi.callback.ITaxiOrderStatusCallback;
import com.mogo.och.taxi.constant.TaxtServingStatusManager;
@@ -45,7 +42,7 @@ import java.util.List;
* 描述
*/
public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASStatusCallback,
ITaxiCarStatusCallback, ITaxiOrderStatusCallback, ITaxiControllerStatusCallback, ILoginCallback {
ITaxiOrderStatusCallback, ITaxiControllerStatusCallback, ILoginCallback {
private static final String TAG = TaxiPresenter.class.getSimpleName();
@@ -74,14 +71,12 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
private void initListeners() {
TaxiModel.getInstance().setADASStatusCallback(this);
TaxiModel.getInstance().setCarStatusCallback(this);
TaxiModel.getInstance().setControllerStatusCallback(this);
TaxiModel.getInstance().setOrderStatusCallback(this);
}
private void releaseListeners() {
TaxiModel.getInstance().setADASStatusCallback(null);
TaxiModel.getInstance().setCarStatusCallback(null);
TaxiModel.getInstance().setControllerStatusCallback(null);
TaxiModel.getInstance().setOrderStatusCallback(null);
OCHAdasAbilityManager.getInstance().release();
@@ -153,11 +148,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
TaxiModel.getInstance().queryCurOrderRouteInfo();
}
// 获取全部订单列表
public void queryOrdersList(int page, int size) {
TaxiModel.getInstance().queryOrdersList(page, size);
}
// 执行抢单动作
public void grabOrder() {
TaxiModel.getInstance().grabOrder();
@@ -168,11 +158,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
TaxiModel.getInstance().cancelNewBookingOrder();
}
// 查询司机服务数据
public void queryDriverServiceData() {
TaxiModel.getInstance().queryDriverServiceData();
}
//更新订单已完成状态
public void completeOrderService() {
TaxiModel.getInstance().orderCompleted();
@@ -236,11 +221,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
runOnUIThread(() -> mView.stopAnimAndUpdateBtnStatus());
}
@Override
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum) {
runOnUIThread(() -> mView.onServiceDataUpdate(dailyTimeDuration,dailyOrderNum));
}
@Override
public void onOrdersInServiceChanged(@NonNull @NotNull List<OrderQueryRespBean.Result> inServiceList) {
@@ -297,11 +277,6 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
runOnUIThread(() -> mView.onCurrentOrderDistToEndChanged(meters,timeInSecond));
}
@Override
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList) {
runOnUIThread(() -> mView.onOrdersListPageRefresh(ordersList));
}
@Override
public void onNewBookingOrderGot(OrderQueryRespBean.Result order) {
runOnUIThread(() -> mView.onNewBookingOrderGot(order));

22
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -71,7 +71,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
private LinearLayout mMapswitchBtn;
private ImageView mSwitchBtnIcon;
private ImageView mCloseNaviIcon;
protected LinearLayout mPersonalBtn;
protected RelativeLayout mSettingBtn;
protected LinearLayout mBadcaseBtn;
protected LinearLayout mAICollectBtn;
@@ -158,23 +157,11 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
// mTrafficLightView = findViewById(R.id.taxi_traffic_light_view);
// CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
mPersonalBtn = findViewById(R.id.module_och_taxi_personal_layout);
// mPersonalBtn = findViewById(R.id.module_och_taxi_personal_layout);
mSpeedView = findViewById(R.id.module_mogo_och_speed_tv);
mCloseNaviIcon = findViewById(R.id.taxi_close_navi_icon);
flNaviPanelContainer = findViewById(R.id.module_mogo_och_navi_panel_container);
// if (DebugConfig.isDebug()) {
mSpeedView.setLongClickable(true); //调试按钮任意模式下都开
// TODO: 2021/11/27 暂去除此调试功能
// mSpeedView.setOnClickListener(v -> {
// onAutopilotStatusChanged(false);
// });
// mSpeedView.setOnLongClickListener(v -> {
// CallerLogger.INSTANCE.d(M_TAXI + TAG, "长按显示状态工具栏");
// Intent intent = new Intent();
// intent.putExtra("oper", 52);
// return true;
// });
// }
mSpeedView.setLongClickable(true); //调试按钮任意模式下都开
tvOperationStatus = findViewById(R.id.module_mogo_och_operation_status);
mDriverRole = findViewById(R.id.taxi_driver_role_tv);
@@ -211,7 +198,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
}
});
mPersonalBtn.setOnClickListener(v -> onGoToTaxiOrders());
mSettingBtn = findViewById(R.id.module_och_taxi_setting_layout);
mSettingBtn.setOnClickListener(v -> {
@@ -297,10 +283,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
}
protected void onGoToTaxiOrders() {
}
private void updateSwitchMapIcon(){
if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isLongSight()) {
mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);

51
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java
View File

@@ -112,7 +112,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
@Override
protected void initViews() {
super.initViews();
mPersonalBtn.setVisibility(View.GONE);
// mPersonalBtn.setVisibility(View.GONE);
initFragment();
hidPanel();
switchVRFlatMode(MogoStatusManager.getInstance().isVrMode());
@@ -192,7 +192,7 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
mDriverRole.setVisibility(View.GONE);
}
tvOperationStatus.setText("暂停接单");
mPersonalBtn.setVisibility(View.VISIBLE);
// mPersonalBtn.setVisibility(View.VISIBLE);
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_back), null, null, null);
showPanel();
} else {
@@ -200,17 +200,11 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
// AIAssist.getInstance(getContext()).speakTTSVoice("已接单");
tvOperationStatus.setText("接单");
tvOperationStatus.setCompoundDrawablesWithIntrinsicBounds(getResources().getDrawable(R.drawable.shape_size_operation_out), null, null, null);
mPersonalBtn.setVisibility(View.GONE);
// mPersonalBtn.setVisibility(View.GONE);
hidPanel();
}
}
@Override
protected void onGoToTaxiOrders() {
personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment(this));
personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data");
}
@Override
public void onMapLoaded() {
}
@@ -339,26 +333,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
serverOrdersFragment.onOrdersWaitServiceChanged(waitServiceList);
}
public void queryOrdersList(int page, int size) {
mPresenter.queryOrdersList(page, size);
}
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList) {
if (null == personalDialogFragment || personalDialogFragment.get() == null){
personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment(this));
}
personalDialogFragment.get().onOrdersListPageRefresh(ordersList);
}
public void queryDriverServiceData() {
mPresenter.queryDriverServiceData();
}
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum) {
if (null == personalDialogFragment || personalDialogFragment.get() == null) return;
personalDialogFragment.get().onServiceDataUpdate(dailyTimeDuration, dailyOrderNum);
}
public void queryCurOrderRouteInfo() {
mPresenter.queryCurOrderRouteInfo();
}
@@ -404,8 +378,23 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
@Subscribe(threadMode = ThreadMode.MAIN)
public void changeOverview(EventLogout eventLogout){
CallerLogger.INSTANCE.d(M_TAXI + TAG,"changeOverview Event消息去登出");
mPresenter.logout();
if (eventLogout.getMessgae() == EventLogout.LOGOUT_TYPE){
CallerLogger.INSTANCE.d(M_TAXI + TAG,"changeOverview Event消息去登出");
mPresenter.logout();
}
}
@Subscribe(threadMode = ThreadMode.MAIN)
public void openOperationalInfoView(EventLogout eventLogout){
if (eventLogout.getMessgae() == EventLogout.PERSONAL_TYPE){
CallerLogger.INSTANCE.d(M_TAXI + TAG,"openOperationalInfoView Event个人中心");
openOperationalInfoView();
}
}
private void openOperationalInfoView(){
personalDialogFragment = new WeakReference<>(new TaxiPersonalDialogFragment());
personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data");
}
private void testRouteInfoUpload() {

71
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java
View File

@@ -22,7 +22,6 @@ import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.annotation.RequiresApi;
import androidx.constraintlayout.widget.ConstraintLayout;
import androidx.fragment.app.DialogFragment;
import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentPagerAdapter;
@@ -31,12 +30,14 @@ import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager.widget.ViewPager;
import com.google.android.material.tabs.TabLayout;
import com.mogo.commons.mvp.MvpDialogFragment;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.constant.TaxiOrderTypeEnum;
import com.mogo.och.taxi.presenter.TaxiOperationalPresenter;
import com.mogo.och.taxi.ui.base.AvoidLeakDialog;
import java.util.ArrayList;
@@ -52,7 +53,9 @@ import me.jessyan.autosize.utils.AutoSizeUtils;
* @author: wangmingjun
* @date: 2021/8/18
*/
public class TaxiPersonalDialogFragment extends DialogFragment implements View.OnClickListener {
public class TaxiPersonalDialogFragment extends
MvpDialogFragment<TaxiPersonalDialogFragment, TaxiOperationalPresenter>
implements View.OnClickListener {
private final static String TAG = "OCHTaxiOrdersDialog";
@@ -72,13 +75,6 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
private static TaxiFragment mTaxiFragment;
private static boolean serverHadNoData = false;
public TaxiPersonalDialogFragment(){
}
public TaxiPersonalDialogFragment(TaxiFragment taxiFragment){
mTaxiFragment = taxiFragment;
}
@NonNull
@Override
public Dialog onCreateDialog(@Nullable Bundle savedInstanceState) {
@@ -87,12 +83,20 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
return dialog;
}
@Nullable
@Override
public View onCreateView(@NonNull LayoutInflater inflater, @Nullable ViewGroup container, @Nullable Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.taxi_orders_list_view, container, false);
initView(view);
return view;
protected int getLayoutId() {
return R.layout.taxi_orders_list_view;
}
@Override
protected void initViews() {
initView();
}
@NonNull
@Override
protected TaxiOperationalPresenter createPresenter() {
return new TaxiOperationalPresenter(this);
}
@Override
@@ -122,15 +126,15 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
window.getDecorView().setBackgroundColor(Color.parseColor("#00FFFFFF"));//设置背景， 不然显示不全
window.setGravity(Gravity.LEFT|Gravity.BOTTOM);
}
private void initView(View view) {
initOperationTabDatas(view);
mCloseIv = view.findViewById(R.id.module_och_taxi_order_list_close_iv);
mOperationDataRl = view.findViewById(R.id.module_och_taxi_operation_data_rl);
mShowOrdersBt = view.findViewById(R.id.module_och_taxi_order_list_show_bt);
mOrdersRv = view.findViewById(R.id.module_och_taxi_order_list);
private void initView() {
initOperationTabDatas();
mCloseIv = findViewById(R.id.module_och_taxi_order_list_close_iv);
mOperationDataRl = findViewById(R.id.module_och_taxi_operation_data_rl);
mShowOrdersBt = findViewById(R.id.module_och_taxi_order_list_show_bt);
mOrdersRv = findViewById(R.id.module_och_taxi_order_list);
mNoDatas = view.findViewById(R.id.no_order_data_view);
ImageView imageView = view.findViewById(R.id.no_order_data_iv);
mNoDatas = findViewById(R.id.no_order_data_view);
ImageView imageView = findViewById(R.id.no_order_data_iv);
imageView.setImageResource(R.drawable.no_order_data);
ConstraintLayout.LayoutParams params = (ConstraintLayout.LayoutParams)imageView.getLayoutParams();
params.width = 480;
@@ -146,9 +150,9 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
}
private void initOperationTabDatas(View view) {
mOperationTab = view.findViewById(R.id.operation_data_tablayout);
mOperationViewPager = view.findViewById(R.id.operation_data_viewpager);
private void initOperationTabDatas() {
mOperationTab = findViewById(R.id.operation_data_tablayout);
mOperationViewPager = findViewById(R.id.operation_data_viewpager);
for (int i= 0;i < mTabTitles.length; i++){
TabLayout.Tab tab = mOperationTab.newTab();
tab.view.setBackgroundColor(Color.parseColor("#00000000"));
@@ -203,12 +207,6 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
mOperationViewPager.setAdapter(new OrdersOperationFragmentAdapter(
getChildFragmentManager(), FragmentPagerAdapter.BEHAVIOR_RESUME_ONLY_CURRENT_FRAGMENT));
fragments.get(0).setmType(0);
// if (mTaxiFragment == null){
// dismiss();
// }else {
// mTaxiFragment.queryDriverServiceData();
// }
}
public void onServiceDataUpdate(long dailyTimeDuration, long dailyOrderNum){
@@ -244,7 +242,7 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
mOperationDataRl.setVisibility(View.GONE);
mNoDatas.setVisibility(View.GONE);
initOrdersView();
requestOrdersList(mNextPage, mPerPageSize);
mPresenter.queryOrdersList(mNextPage, mPerPageSize);
}
}
@@ -256,20 +254,17 @@ public class TaxiPersonalDialogFragment extends DialogFragment implements View.O
@Override
public void onLoadMore() {
if (!serverHadNoData){
requestOrdersList(mNextPage, mPerPageSize);
mPresenter.queryOrdersList(mNextPage, mPerPageSize);
}
}
});
mOrdersRv.setAdapter(mAdapter);
}
private void requestOrdersList(int page, int size){
mTaxiFragment.queryOrdersList(page,size);
}
public void onOrdersListPageRefresh(List<OrderQueryRespBean.Result> ordersList){
try {
if (null == ordersList && mNextPage == 0){//无数据
if (null == ordersList && mNextPage == 0 ||
(ordersList != null && ordersList.size() == 0)){//无数据
mOrdersRv.setVisibility(View.GONE);
mNoDatas.setVisibility(View.VISIBLE);
return;

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

@@ -121,25 +121,6 @@
android:layout_marginBottom="@dimen/dp_20"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"/>
<LinearLayout
android:id="@+id/module_och_taxi_personal_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_marginBottom="@dimen/module_mogo_och_margin_bottom"
android:layout_marginLeft="40dp"
android:elevation="@dimen/dp_10"
android:background="@drawable/taxi_operation_status_bg"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status"
android:gravity="center"
app:layout_goneMarginLeft="48dp">
<ImageView
android:layout_width="@dimen/dp_50"
android:layout_height="@dimen/dp_50"
android:background="@drawable/taxi_personal_btn"
android:layout_gravity="center" />
</LinearLayout>
<RelativeLayout
android:id="@+id/module_och_taxi_setting_layout"
@@ -150,7 +131,7 @@
android:background="@drawable/taxi_operation_status_bg"
android:elevation="@dimen/dp_10"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toRightOf="@id/module_och_taxi_personal_layout">
app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status">
<ImageView
android:layout_width="@dimen/dp_50"

2
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/AutoPilotAndCheckView.kt
View File

@@ -163,7 +163,7 @@ class AutoPilotAndCheckView @JvmOverloads constructor(
private fun initOchView() {
actvLoginout.onClick {
EventBus.getDefault().post(EventLogout())
EventBus.getDefault().post(EventLogout(EventLogout.LOGOUT_TYPE))
}
actvLoginout.visibility = View.VISIBLE
CallerHmiManager.setBusOperationView(toolBusOperationView)

9
core/function-impl/mogo-core-function-hmi/src/main/java/com/mogo/eagle/core/function/hmi/ui/tools/BusOperationView.kt
View File

@@ -4,8 +4,10 @@ import android.content.Context
import android.util.AttributeSet
import android.view.LayoutInflater
import android.view.View
import com.mogo.eagle.core.data.temp.EventLogout
import com.mogo.eagle.core.function.api.hmi.view.IOchBusView
import com.mogo.eagle.core.function.hmi.R
import com.mogo.eagle.core.utilcode.kotlin.onClick
import com.mogo.eagle.core.utilcode.util.SharedPrefs
import com.mogo.eagle.core.utilcode.util.StringUtils
import kotlinx.android.synthetic.main.view_och_bus_operation.view.*
@@ -26,8 +28,15 @@ class BusOperationView @JvmOverloads constructor(
context?.let {
actvAccountPhone.text = phoneMask(SharedPrefs.getInstance(it).getString("och_account",""))
}
clickPersonalRightView();
}
private fun clickPersonalRightView() {
ivGotoPersonalInfo.onClick {
EventBus.getDefault().post(EventLogout(EventLogout.PERSONAL_TYPE))
}
}
override fun showBusOperation() {
ochBusOperationStatus.visibility = View.VISIBLE
}

2
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_auto_pilot_check.xml
View File

@@ -19,7 +19,7 @@
<com.mogo.eagle.core.function.hmi.ui.tools.BusOperationView
android:id="@+id/toolBusOperationView"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="162dp"
app:layout_constraintStart_toStartOf="parent"

12
core/function-impl/mogo-core-function-hmi/src/main/res/layout/view_och_bus_operation.xml
View File

@@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/ochBusOperationStatus"
android:layout_width="wrap_content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
tools:visibility="visible"
tools:ignore="DuplicateIds">
@@ -60,4 +60,14 @@
android:textColor="@android:color/white"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/ivGotoPersonalInfo"
android:layout_width="@dimen/dp_17"
android:layout_height="@dimen/dp_32"
android:src="@drawable/icon_right"
android:layout_marginRight="@dimen/dp_40"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="@+id/actvAccountPhone"
app:layout_constraintBottom_toBottomOf="@+id/actvAccountPhone"/>
</androidx.constraintlayout.widget.ConstraintLayout>

12
core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java
View File

@@ -2,4 +2,16 @@ package com.mogo.eagle.core.data.temp;
//临时使用 后期需要封装
public class EventLogout {
private int messgaeType;
public final static int LOGOUT_TYPE = 100001;
public final static int PERSONAL_TYPE = 100002;
public EventLogout(int messgaeType) {
this.messgaeType = messgaeType;
}
public int getMessgae() {
return messgaeType;
}
}