Merge branch 'qa_hengyang_base' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into qa_hengyang_base

OCH/mogo-och-bus/src/main/res/drawable/module_och_bus_panel_bkg.xml

@@ -2,7 +2,7 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <corners android:radius="17px" />
+            <corners android:radius="32px" />
             <solid android:color="#3B4577"/>
         </shape>
     </item>
@@ -12,7 +12,7 @@
         android:right="3px"
         android:top="3px">
         <shape>
-            <corners android:radius="17px" />
+            <corners android:radius="32px" />
             <solid android:color="#3B4577"/>
         </shape>
     </item>

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;

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( "收车" );

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" />

OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml

@@ -21,10 +21,10 @@
     <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">140px</dimen>
-    <dimen name="module_mogo_och_operation_status_bg_height">140px</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_width">120px</dimen>
+    <dimen name="module_mogo_och_operation_status_bg_height">120px</dimen>
 
-    <dimen name="module_mogo_och_operation_status_padding">92px</dimen>
+    <dimen name="module_mogo_och_operation_status_padding">83px</dimen>
 
     <dimen name="module_mogo_och_autopilot_order_m_t">30px</dimen>
     <dimen name="module_mogo_och_autopilot_order_bg_width">466px</dimen>
@@ -32,7 +32,8 @@
 
 
 <!--    <dimen name="module_mogo_och_autopilot_status_text_size">44px</dimen>-->
-    <dimen name="module_mogo_och_autopilot_status_text_size">49px</dimen>
+    <dimen name="module_mogo_och_autopilot_status_text_size">46px</dimen>
+    <dimen name="module_mogo_och_operation_status_text_size">36px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_padding_top">13px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_drawable_padding">12px</dimen>
     <dimen name="module_mogo_och_autopilot_status_text_m_l">350px</dimen>

gradle.properties

@@ -187,4 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
-MAP_SDK_VERSION=1.0.0-vr-8.5.50
+MAP_SDK_VERSION=1.0.0-vr-8.5.49