From cbc8ee1f72511ea95992e0fb3399ef3abe3e549b Mon Sep 17 00:00:00 2001 From: lianglihui Date: Mon, 21 Jun 2021 18:23:18 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E8=B0=83=E8=AF=95=20UI=E8=B5=B0=E6=9F=A5=20=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../res/drawable/module_och_bus_panel_bkg.xml | 4 +-- .../com/mogo/och/taxi/MogoOCHTaxiModel.java | 36 ++++++++----------- .../com/mogo/och/taxi/ui/OCHTaxiFragment.java | 1 + .../layout/module_mogo_och_base_fragment.xml | 3 +- .../res/values-xhdpi-2560x1440/dimens.xml | 9 ++--- 5 files changed, 23 insertions(+), 30 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml index 204c5fc692..4a08f10745 100644 --- a/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml +++ b/OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml @@ -2,7 +2,7 @@ - + @@ -12,7 +12,7 @@ android:right="3px" android:top="3px"> - + diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java index a256c40d2f..c044046c82 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java @@ -132,12 +132,12 @@ class MogoOCHTaxiModel { .getApis() .getIntentManagerApi() .registerIntentListener( ConnectivityManager.CONNECTIVITY_ACTION, mNetWorkIntentListener ); - if ( NetworkUtils.isConnected( mContext ) ) { - restoreOrderInfo(); - } - if ( NetworkUtils.isConnected( mContext ) ) { - querryCarStatus(); - } +// if ( NetworkUtils.isConnected( mContext ) ) { +// restoreOrderInfo(); +// } +// if ( NetworkUtils.isConnected( mContext ) ) { +// querryCarStatus(); +// } } public void querryCarStatus() { @@ -148,7 +148,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess(OCHCarStatusResponse data) { super.onSuccess(data); - Logger.e(TAG,"OCHCarStatusResponse:"+data.data.status); + Logger.e(TAG,"querryCarStatus:"+data.data.status); mOCHRHCarstatus = data.data.status; //更新view OCHTaxiUiController.getInstance().onOperationChanged(mOCHRHCarstatus==1); @@ -159,13 +159,13 @@ class MogoOCHTaxiModel { @Override public void onError(Throwable e) { super.onError(e); - Logger.e(TAG,"OCHCarStatusResponse:"+e.getMessage()); + Logger.e(TAG,"querryCarStatus:"+e.getMessage()); } @Override public void onError(String message, int code) { super.onError(message,code); - Logger.e(TAG,"OCHCarStatusResponse:"+message); + Logger.e(TAG,"querryCarStatus:"+message); } }); } @@ -189,19 +189,9 @@ class MogoOCHTaxiModel { Logger.d(TAG,"restoreOrderInfo:"+orderInfo); if ( !TextUtils.isEmpty( orderInfo ) ) { mCurrentOCHOrder = GsonUtil.objectFromJson( orderInfo, OCHTaxiOrderResponse.class ); - if ( mCurrentOCHOrder == null ) { - // 解决本地没有缓存订单号的问题 - query2RestoreOrderStatus( null ); - } else { - query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); - } - } else { - // 解决本地没有缓存订单号的问题 - query2RestoreOrderStatus( null ); } - } else { - query2RestoreOrderStatus( mCurrentOCHOrder.orderNo ); } + query2RestoreOrderStatus(mCurrentOCHOrder == null ? null : mCurrentOCHOrder.orderNo); } // private void restoreOrderInfo_() { @@ -244,7 +234,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess( OCHTaxiOrderResponse2 data ) { - if ( data == null || data.data == null ) { + if ( data == null || data.data == null) { Logger.d( TAG, "订单已取消或已完成" ); clearCurrentOCHOrder(); OCHTaxiUiController.getInstance().onOrderStatusChanged(OCHOrderStatus.None.getCode()); @@ -359,7 +349,8 @@ class MogoOCHTaxiModel { Logger.d( TAG, "onIntentReceived = %s", intentStr ); if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) { if ( NetworkUtils.isConnected( mContext ) ) { - restoreOrderInfo(); +// restoreOrderInfo(); + querryCarStatus(); } } } @@ -384,6 +375,7 @@ class MogoOCHTaxiModel { @Override public void onSuccess(OCHCarStatusResponse o) { super.onSuccess(o); + Logger.d(TAG,"OCHCarStatusResponse:"+o.data.status); mOCHRHCarstatus = o.data.status; // mIsWork = mOCHRHCarstatus.status == 1; // mOCHRHCarstatus.status = status; diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java index d78518eaad..ad814460dd 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java @@ -385,6 +385,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i @Override public void onOperationChanged(boolean launch) { + Logger.e(TAG,"onOperationChanged:"+ launch); isOperationStatus = launch; if ( launch ) { tvOperationStatus.setText( "收车" ); diff --git a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml index 66ae400e43..c369dc9da8 100644 --- a/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml +++ b/OCH/mogo-och/src/main/res/layout/module_mogo_och_base_fragment.xml @@ -20,7 +20,6 @@ android:text="自动驾驶" android:textColor="@color/module_mogo_och_autopilot_text_color_normal" android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" - android:textStyle="bold" app:layout_constraintLeft_toLeftOf="parent" app:layout_constraintTop_toTopOf="parent" tools:visibility="visible" /> @@ -50,7 +49,7 @@ android:text="出车" android:textAlignment="center" android:textColor="@color/module_mogo_och_autopilot_text_color_selector" - android:textSize="@dimen/module_mogo_och_autopilot_status_text_size" + android:textSize="@dimen/module_mogo_och_operation_status_text_size" android:textStyle="bold" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintLeft_toLeftOf="parent" /> diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml index 96770d26e2..44445885c1 100644 --- a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -21,10 +21,10 @@ 460px 140px - 140px - 140px + 120px + 120px - 92px + 83px 30px 466px @@ -32,7 +32,8 @@ - 49px + 46px + 36px 13px 12px 350px