diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 4ca1a90fa8..1e9e003dfe 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -120,8 +120,10 @@ public class BusFragment extends BaseBusTabFragment @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 diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt index e64b84e1e2..814e5295e9 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/OCHSocketMessageManager.kt @@ -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 registerSocketMessageListener(msgType:Int, mogoOnMessageListener :IMogoOnMessageListener){ diff --git a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt index 5b5f2701d5..710db57904 100644 --- a/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt +++ b/OCH/mogo-och-common-module/src/main/java/com/mogo/och/common/module/biz/common/socketmessage/data/OCHOperationalMessage.kt @@ -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() // 消息下发时间戳 ) \ No newline at end of file diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java similarity index 52% rename from OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java rename to OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java index b51f44ec35..40b352acfa 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiCarOperationalCallback.java @@ -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 ordersList); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java index eb825964ed..7ffc67eb0f 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/callback/ITaxiOrderStatusCallback.java @@ -31,9 +31,6 @@ public interface ITaxiOrderStatusCallback { // 当前位置距离上车点的距离（米）、预估时间（秒） void onCurrentOrderDistToEndChanged(long meters, long timeInSecond); - // 获取全部订单列表（含已完成、已取消）的反馈 - void onOrdersListPageRefresh(List ordersList); - // 新到预约单 void onNewBookingOrderGot(OrderQueryRespBean.Result order); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 747d746456..b474ae2ece 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -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 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); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java new file mode 100644 index 0000000000..f97b97d72a --- /dev/null +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiOperationalPresenter.java @@ -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 + 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 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(); + } + } + +} diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java index 46410c4b48..57e8d6cdf6 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/presenter/TaxiPresenter.java @@ -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 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 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 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 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 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 inServiceList) { @@ -297,11 +277,6 @@ public class TaxiPresenter extends Presenter implements ITaxiADASS runOnUIThread(() -> mView.onCurrentOrderDistToEndChanged(meters,timeInSecond)); } - @Override - public void onOrdersListPageRefresh(List ordersList) { - runOnUIThread(() -> mView.onOrdersListPageRefresh(ordersList)); - } - @Override public void onNewBookingOrderGot(OrderQueryRespBean.Result order) { runOnUIThread(() -> mView.onNewBookingOrderGot(order)); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java index d2e52ff38a..21e62525d1 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java @@ -71,7 +71,6 @@ public abstract class BaseTaxiTabFragment { -// 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 onGoToTaxiOrders()); mSettingBtn = findViewById(R.id.module_och_taxi_setting_layout); mSettingBtn.setOnClickListener(v -> { @@ -297,10 +283,6 @@ public abstract class BaseTaxiTabFragment(new TaxiPersonalDialogFragment(this)); - personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data"); - } - @Override public void onMapLoaded() { } @@ -339,26 +333,6 @@ public class TaxiFragment extends BaseTaxiTabFragment 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(new TaxiPersonalDialogFragment()); + personalDialogFragment.get().show(getActivity().getSupportFragmentManager(), "service_data"); } private void testRouteInfoUpload() { diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java index e9df207e2c..277a26fc8c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiPersonalDialogFragment.java @@ -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 + 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 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; diff --git a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml index 650a453c96..bac071d852 100644 --- a/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml +++ b/OCH/mogo-och-taxi/src/main/res/layout/taxi_base_fragment.xml @@ -121,25 +121,6 @@ android:layout_marginBottom="@dimen/dp_20" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintBottom_toBottomOf="parent"/> - - - - + app:layout_constraintLeft_toRightOf="@id/module_mogo_och_operation_status"> @@ -60,4 +60,14 @@ android:textColor="@android:color/white" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + + \ No newline at end of file diff --git a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java index cbbf9e4968..e8bf18c318 100644 --- a/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java +++ b/core/mogo-core-data/src/main/java/com/mogo/eagle/core/data/temp/EventLogout.java @@ -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; + } } +