[6.4.0]

[taxi 样式调整]

OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1080x1920.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_751"
-    android:layout_height="@dimen/dp_568"
+    android:layout_height="wrap_content"
     android:background="@drawable/biz_login_error_info_1080x1920">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -40,12 +40,14 @@
         android:layout_marginStart="@dimen/dp_48"
         android:layout_marginEnd="@dimen/dp_48"
         android:layout_marginTop="@dimen/dp_39"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
+        android:layout_marginBottom="@dimen/dp_68"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_44"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/actv_error_head"
         tools:text="T1 passanger-Saas Online-5.4.1001 AppSN：12342392349 司机SN：0383423942739" />
 

OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_1920x1080.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_939"
-    android:layout_height="@dimen/dp_710"
+    android:layout_height="wrap_content"
     android:background="@drawable/biz_login_error_info">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -40,13 +40,14 @@
         android:layout_width="match_parent"
         android:layout_marginStart="@dimen/dp_60"
         android:layout_marginEnd="@dimen/dp_60"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
         android:gravity="center"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_40"
+        android:layout_marginTop="@dimen/dp_41"
+        android:layout_marginBottom="@dimen/dp_39"
         app:layout_constraintBottom_toTopOf="@+id/actv_see"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.495"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/actv_error_head"
         tools:text="T1 passanger-Saas Online-5.4.1001 AppSN：12342392349 司机SN：0383423942739" />

OCH/common/biz/src/main/res/layout/biz_login_errorinfo_view_2560x1600.xml

@@ -3,7 +3,7 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/dp_939"
-    android:layout_height="@dimen/dp_730"
+    android:layout_height="wrap_content"
     android:background="@drawable/biz_login_error_info">
 
     <androidx.appcompat.widget.AppCompatTextView
@@ -39,7 +39,9 @@
         android:layout_width="match_parent"
         android:layout_marginStart="@dimen/dp_60"
         android:layout_marginEnd="@dimen/dp_60"
-        android:layout_height="0dp"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/dp_41"
+        android:layout_marginBottom="@dimen/dp_39"
         android:gravity="center"
         android:textColor="@android:color/white"
         android:textSize="@dimen/dp_40"

OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1080x1920.xml

@@ -15,6 +15,8 @@
         android:text="当前状态:连接司机屏中"
         android:textColor="@color/white"
         android:gravity="center"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         android:textSize="@dimen/dp_28"
         app:layout_constraintBottom_toTopOf="@+id/actv_app_version"
         app:layout_constraintEnd_toEndOf="parent"
@@ -25,6 +27,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_41"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         android:gravity="center"
         android:text="版本号:6.4.0"
         android:textColor="@color/white"
@@ -36,7 +40,7 @@
     <com.mogo.och.biz.login.ui.errorview.ErrorInfoView
         android:id="@+id/eiv_Info"
         android:layout_width="@dimen/dp_751"
-        android:layout_height="@dimen/dp_568"
+        android:layout_height="wrap_content"
         android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

OCH/common/biz/src/main/res/layout/biz_login_passenger_view_1920x1080.xml

@@ -15,6 +15,8 @@
         app:layout_constraintBottom_toTopOf="@+id/actv_app_version"
         android:text="当前状态:连接司机屏中"
         android:textColor="@color/white"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         android:textSize="@dimen/dp_24"
         android:gravity="end"
         app:layout_constraintBottom_toBottomOf="parent"
@@ -27,6 +29,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_41"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         android:text="版本号:6.4.0"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_24"
@@ -38,7 +42,7 @@
     <com.mogo.och.biz.login.ui.errorview.ErrorInfoView
         android:id="@+id/eiv_Info"
         android:layout_width="@dimen/dp_939"
-        android:layout_height="@dimen/dp_710"
+        android:layout_height="wrap_content"
         android:visibility="gone"
         app:layout_constraintTop_toTopOf="parent"
         app:layout_constraintBottom_toBottomOf="parent"

OCH/common/biz/src/main/res/layout/biz_login_passenger_view_2560x1600.xml

@@ -15,6 +15,8 @@
         android:text="当前状态:连接司机屏中"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_26"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         app:layout_constraintBottom_toTopOf="@+id/actv_app_version"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_chainStyle="packed"
@@ -25,6 +27,8 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_70"
+        android:layout_marginStart="@dimen/dp_160"
+        android:layout_marginEnd="@dimen/dp_160"
         android:text="版本号:6.4.0"
         android:textColor="@color/white"
         android:textSize="@dimen/dp_26"
@@ -35,7 +39,7 @@
     <com.mogo.och.biz.login.ui.errorview.ErrorInfoView
         android:id="@+id/eiv_Info"
         android:layout_width="@dimen/dp_939"
-        android:layout_height="@dimen/dp_710"
+        android:layout_height="wrap_content"
         android:layout_marginBottom="@dimen/dp_414"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="parent"

OCH/common/common/src/main/java/com/mogo/och/common/module/network/OchCommonSubscribeImpl.kt

@@ -10,7 +10,8 @@ import com.mogo.och.common.module.utils.CallerLoggerUtils.flavorTag
 class OchCommonSubscribeImpl<T : BaseData>(
     val context: Any,
     val callback: OchCommonServiceCallback<T>?,
-    val apiName: String
+    val apiName: String,
+    val writeLog:Boolean = true
 ) : SubscribeImpl<T>(RequestOptions.create(context)) {
 
     companion object {
@@ -19,27 +20,38 @@ class OchCommonSubscribeImpl<T : BaseData>(
 
     init {
         CallerLogger.e("$flavorTag$TAG", "$apiName: 去请求()")
-        OchChainLogManager.writeChainLogNet("接口:${apiName}","去请求")
+        if(writeLog) {
+            OchChainLogManager.writeChainLogNet("接口:${apiName}", "去请求")
+        }
     }
 
     override fun onSuccess(o: T) {
         super.onSuccess(o)
         CallerLogger.d("$flavorTag$TAG", "$apiName: onSuccess() ${o.msg}")
-        OchChainLogManager.writeChainLogNet("接口:${apiName}","请求成功:${o}")
+        if(writeLog) {
+            OchChainLogManager.writeChainLogNet("接口:${apiName}", "请求成功:${o}")
+        }
         callback?.onSuccess(o)
     }
 
     override fun onError(e: Throwable) {
         super.onError(e)
         CallerLogger.e("$flavorTag$TAG", "$apiName: onError() ${e.message}")
-        OchChainLogManager.writeChainLogNet("接口:${apiName}","请求失败:${e.message}")
+        if(writeLog) {
+            OchChainLogManager.writeChainLogNet("接口:${apiName}", "请求失败:${e.message}")
+        }
         callback?.onError("$apiName: onError() ${e.message}")
     }
 
     override fun onError(message: String, code: Int) {
         super.onError(message, code)
         CallerLogger.e("$flavorTag$TAG", "$apiName: onError() code = $code; message = $message")
-        OchChainLogManager.writeChainLogNet("接口:${apiName}","请求失败: onError() code = $code; message = $message\"")
+        if(writeLog) {
+            OchChainLogManager.writeChainLogNet(
+                "接口:${apiName}",
+                "请求失败: onError() code = $code; message = $message\""
+            )
+        }
         callback?.onFail(code, message)
     }
 }

OCH/common/common/src/main/java/com/mogo/och/common/module/utils/FlavorUtils.kt

@@ -59,8 +59,12 @@ object FlavorUtils {
                 info.append(" qa ")
             }
         }
+        if(AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)){
+            info.append(" Driver")
+        }else  if(AppIdentityModeUtils.isPassenger(FunctionBuildConfig.appIdentityMode)){
+            info.append(" Passenger")
+        }
 
-        info.append(" Passenger")
         info.append(" ${AppUtils.getAppVersionName()}")
         info.append(" AppSN:${SharedPrefsMgr.getInstance().sn}")
         return info.toString()

OCH/taxi/driver/build.gradle

@@ -43,6 +43,15 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+
+    sourceSets {
+        main {
+            res.srcDirs = [
+                    'src/main/res',
+                    'src/main/res/ani',
+            ]
+        }
+    }
 }
 
 dependencies {

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/network/TaxiServiceManager.kt

@@ -39,7 +39,7 @@ object TaxiServiceManager {
             SharedPrefsMgr.getInstance().sn
         )
             .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService"))
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryOrdersInAndWaitService",false))
     }
 
     /**
@@ -58,7 +58,7 @@ object TaxiServiceManager {
             SharedPrefsMgr.getInstance().sn
         )
             .transformTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "queryNewBookingOrder"))
+            .subscribe(OchCommonSubscribeImpl(context, callback, "queryNewBookingOrder",false))
     }
 
     /**

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java

@@ -18,15 +18,13 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
+import androidx.constraintlayout.widget.ConstraintLayout;
 import androidx.constraintlayout.widget.Group;
 import androidx.fragment.app.FragmentTransaction;
 
-import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.mvp.IView;
 import com.mogo.commons.mvp.MvpFragment;
 import com.mogo.commons.mvp.Presenter;
-import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotRecordListener;
 import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager;
 import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotRecordListenerManager;
@@ -38,25 +36,13 @@ import com.mogo.eagle.core.function.hmi.ui.msgbox.DriverMsgBoxListView;
 import com.mogo.eagle.core.function.view.MapBizView;
 import com.mogo.eagle.core.function.smp.view.SmallMapView;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
-import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant;
 import com.mogo.eagle.core.utilcode.mogo.view.OnPreventFastClickListener;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
 import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
 import com.mogo.map.listener.IMogoMapListener;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.map.uicontroller.VisualAngleMode;
-import com.mogo.och.common.module.utils.AnimatorDrawableUtil;
-import com.mogo.och.common.module.utils.FrameAnimatorContainer;
 import com.mogo.och.taxi.R;
-import com.mogo.och.taxi.ui.speed.SpeedView;
-
-import java.util.Arrays;
-import java.util.Objects;
-
-import bag_manager.BagManagerOuterClass;
-import me.jessyan.autosize.utils.AutoSizeUtils;
-import mogo.telematics.pad.MessagePad;
-import record_cache.RecordPanelOuterClass;
 
 
 /**
@@ -66,11 +52,10 @@ import record_cache.RecordPanelOuterClass;
  *
  * @author tongchenfei
  */
-public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener, IMoGoAutopilotRecordListener {
+public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V>> extends MvpFragment<V, P> implements IMogoMapListener {
 
     private static final String TAG = "BaseOchFragment";
     private RelativeLayout ctvAutopilotStatusRL;
-    private ImageView mAnimFlowIv;
     protected TextView tvOperationStatus;
     protected TextView mDriverRole;
     protected FrameLayout flStationPanelContainer;
@@ -92,22 +77,16 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
     protected TaxiAmapNaviFragment ochAmapNaviFragment = null;
     protected TaxiRottingNaviFragment taxiRottingNaviFragment = null;
-    // protected TaxiTrafficLightView mTrafficLightView;
 
     protected SmallMapView smallMapView;
 
     private final Handler mHandler = new Handler(Looper.getMainLooper());
 
-    private FrameAnimatorContainer startAutopilotAnimator;
-    private FrameAnimatorContainer startManCOAnimator;
-
     @Override
     protected int getLayoutId() {
         return R.layout.taxi_base_fragment;
     }
 
-    private View panelView;
-
     @Override
     protected void initViews() {
         mapBizView = findViewById(R.id.mapBizView);
@@ -116,14 +95,11 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         ctvAutopilotStatusRL.setBackground(getResources().getDrawable(R.drawable.taxi_autopilot_bg_selector));
         updateCtvAutopilotStatusTag(false);
         mAutopilotImage = findViewById(R.id.module_och_autopilot_iv);
-        mAnimFlowIv = findViewById(R.id.anim_flow_iv);
         mAutopilotTv = findViewById(R.id.module_och_autopilot_tv);
         flStationPanelContainer = findViewById(R.id.module_mogo_och_station_panel_container);
         driverMsgBoxButtonView = findViewById(R.id.viewDriverMsgBoxButton);
         viewDriverMsgBoxList = findViewById(R.id.viewDriverMsgBoxList);
         viewDriverMsgBoxBubble = findViewById(R.id.viewDriverMsgBoxBubble);
-        // mTrafficLightView = findViewById(R.id.taxi_traffic_light_view);
-        // CallerHmiManager.INSTANCE.setProxyTrafficLightView(mTrafficLightView);
 
         mSpeedView = findViewById(R.id.taxi_speed_contain);
         if (mSpeedView != null) {
@@ -170,14 +146,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             CallerHmiManager.INSTANCE.showToolsView();
         });
 
-        // mBadcaseBtn的visible显示逻辑在showBadcaseEntrance内处理
         mBadcaseBtn = findViewById(R.id.module_och_taxi_badcase_ll);
         if (mBadcaseBtn != null) {
-            CallerDevaToolsManager.INSTANCE.reportWorkOrder(mBadcaseBtn);
-            CallerAutopilotRecordListenerManager.INSTANCE.addListener(TAG, this);
+            CallerDevaToolsManager.INSTANCE.initBadCase(mBadcaseBtn);
         }
 
-        panelView = LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer);
+        LayoutInflater.from(getContext()).inflate(getStationPanelViewId(), flStationPanelContainer);
         ctvAutopilotStatusRL.setOnClickListener(new OnPreventFastClickListener() {
             @Override
             public void onClickImpl(View v) {
@@ -194,7 +168,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         });
 
         // debug下调用测试面板 长按速度值 任意模式下调试都打开
-//        if (DebugConfig.isDebug()) {
         mSpeedView.setOnLongClickListener(v -> {
             if (groupTestPanel.getVisibility() == View.VISIBLE) {
                 groupTestPanel.setVisibility(View.GONE);
@@ -203,7 +176,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             }
             return false;
         });
-//        }
 
         onAutopilotStatusChanged(CallerAutoPilotStatusListenerManager.INSTANCE.getState());
 
@@ -254,32 +226,6 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
         smallMapView = findViewById(R.id.smallMapView);
 
-
-        int width = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 420f);
-        int height = AutoSizeUtils.dp2px(AbsMogoApplication.getApp(), 220f);
-        startAutopilotAnimator = new FrameAnimatorContainer(R.array.anim_flow, 20,mAnimFlowIv,false,false,false,width,height);
-        startAutopilotAnimator.setOnAnimStopListener(new FrameAnimatorContainer.OnAnimationStoppedListener() {
-            @Override
-            public void playOnce() {
-
-            }
-            @Override
-            public void AnimationStopped() {
-                CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "自动驾驶动画暂停");
-            }
-        });
-        startManCOAnimator = new FrameAnimatorContainer(R.array.nim_flow_man_co, 20,mAnimFlowIv,false,false,false,width,height);
-        startManCOAnimator.setOnAnimStopListener(new FrameAnimatorContainer.OnAnimationStoppedListener() {
-            @Override
-            public void playOnce() {
-
-            }
-
-            @Override
-            public void AnimationStopped() {
-                CallerLogger.d(SceneConstant.M_TAXI_P + TAG, "平行驾驶动画暂停");
-            }
-        });
     }
 
     @Override
@@ -349,36 +295,21 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         super.onDestroy();
     }
 
-    @Override
-    public void onAutopilotRecordResult(@Nullable RecordPanelOuterClass.RecordPanel recordPanel) {
-    }
-
-    @Override
-    public void onAutopilotRecordConfig(@NonNull MessagePad.RecordDataConfig config) {
-    }
-
-    @Override
-    public void onBagManagerResult(@NonNull BagManagerOuterClass.BagManager bagManager) {
-    }
-
     public void onAutopilotStatusChanged(int status) {
-        UiThreadHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) {
-                    // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading
-                    return;
-                }
-                if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) {
-                    // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false
-                    startAutopilotDone(true);
-                    return;
-                }
-                // 3. 其他过程直接更新
-                startOrStopLoadingAnim(false);
-                autopilotStatusAnimchanged(status);
+        getActivity().runOnUiThread(() -> {
+            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING != status) {
+                // 1. 主动开启自动驾驶中，不为2（为0、1）则继续loading
+                return;
             }
-        },UiThreadHandler.MODE.QUEUE);
+            if (isStarting && IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING == status) {
+                // 2. 主动开启自动驾驶中，为2则停止loading，并isStarting = false
+                startAutopilotDone(true);
+                return;
+            }
+            // 3. 其他过程直接更新
+            startOrStopLoadingAnim(false);
+            autopilotStatusAnimchanged(status);
+        });
     }
 
     public void stopAnimAndUpdateBtnStatus() {
@@ -408,46 +339,23 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
             mAutopilotTv.setText("自动驾驶");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-            if(startManCOAnimator!=null) {
-                startManCOAnimator.stop();
-            }
-            if(startAutopilotAnimator!=null) {
-                startAutopilotAnimator.reStart();
-            }
+            //ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_autopilot_success);
         } else if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_ENABLE == status) {
             mAutopilotTv.setText("自动驾驶");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-
-            if(startAutopilotAnimator!=null) {
-                startAutopilotAnimator.stop();
-            }
-            if(startManCOAnimator!=null) {
-                startManCOAnimator.stop();
-            }
-            mAnimFlowIv.setImageResource(0);
-
+            //ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_autopilot_bg_selector);
         } else if (IMoGoAutopilotStatusListener.STATUS_PARALLEL_DRIVING == status) {
             mAutopilotTv.setText("远程代驾");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_normal));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot);
-            if(startAutopilotAnimator!=null) {
-                startAutopilotAnimator.stop();
-            }
-            if(startManCOAnimator!=null) {
-                startManCOAnimator.reStart();
-            }
+            //ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_autopilot_pingxjs);
+            // 平行驾驶
         } else {
             mAutopilotTv.setText("自动驾驶");
             mAutopilotTv.setTextColor(getResources().getColor(R.color.taxi_autopilot_text_color_disable));
             mAutopilotImage.setImageResource(R.drawable.taxi_ic_autopilot_disable);
-            if(startAutopilotAnimator!=null) {
-                startAutopilotAnimator.stop();
-            }
-            if(startManCOAnimator!=null) {
-                startManCOAnimator.stop();
-            }
-            mAnimFlowIv.setImageResource(0);
+            //ctvAutopilotStatusRL.setBackgroundResource(R.drawable.taxi_ic_autopilot_bg);
         }
 
     }
@@ -526,24 +434,15 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
     }
 
     public void hidPanel() {
-        UiThreadHandler.post(new Runnable() {
-            @Override
-            public void run() {
+        getActivity().runOnUiThread(() -> {
             flStationPanelContainer.setVisibility(View.GONE);
-        }},UiThreadHandler.MODE.QUEUE);
+        });
     }
 
     public void showPanel() {
-        UiThreadHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                flStationPanelContainer.setVisibility(View.VISIBLE);
-            }
-        },UiThreadHandler.MODE.QUEUE);
-    }
-
-    public View getPanelView() {
-        return panelView;
+        getActivity().runOnUiThread(() -> {
+            flStationPanelContainer.setVisibility(View.VISIBLE);
+        });
     }
 
     /**
@@ -560,15 +459,12 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
 
 
     public void changeOperationViewVisible(int visible) {
-        UiThreadHandler.post(new Runnable() {
-            @Override
-            public void run() {
-                if (tvOperationStatus == null) {
-                    return;
-                }
-                tvOperationStatus.setVisibility(visible);
+        getActivity().runOnUiThread(() -> {
+            if (tvOperationStatus == null) {
+                return;
             }
-        },UiThreadHandler.MODE.QUEUE);
+            tvOperationStatus.setVisibility(visible);
+        });
     }
 
     protected void showAmapNaviToStationFragment(boolean isShow) {
@@ -577,9 +473,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
         closeAmapViewIFHadeAdd();
         if (isShow) {
             closeRouteViewIFHadeAdd();
-//            if (ochNaviFragment == null){
             ochAmapNaviFragment = TaxiAmapNaviFragment.newInstance();
-//            }
             if (ochAmapNaviFragment.isAdded()) {
                 return;
             }

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiFragment.java

@@ -34,8 +34,6 @@ import org.greenrobot.eventbus.ThreadMode;
 import java.lang.ref.WeakReference;
 import java.util.List;
 
-import bag_manager.BagManagerOuterClass;
-
 /**
  * @author congtaowang
  * @since 2021/1/18
@@ -55,8 +53,12 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         return fragment;
     }
 
+    // 抢单信息
     private WeakReference<TaxiGrabOrderFragment> grabOrderFragmentWR;
+    // 待服务信息
     private WeakReference<TaxiServerOrdersFragment> serverOrdersFragmentWR;
+
+    // 查看运营情况 点击账户信息右边的箭头展示
     private WeakReference<TaxiPersonalDialogFragment> personalDialogFragment = null;
 
     @Override
@@ -423,9 +425,6 @@ public class TaxiFragment extends BaseTaxiTabFragment<TaxiFragment, TaxiPresente
         }
     }
 
-    @Override
-    public void onBagManagerResult(@NonNull BagManagerOuterClass.BagManager bagManager) {
-    }
     //endregion
 
 }

OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiServerOrdersFragment.java

@@ -81,7 +81,7 @@ public class TaxiServerOrdersFragment extends BaseTaxiUIFragment {
             tab.view.setBackgroundColor(Color.parseColor("#00000000"));
             TextView tabView = (TextView) View.inflate(getActivity(),R.layout.taxi_tab_item_custom,null);
             tabView.setText(mTabTitles[i]);
-            tabView.setHeight(AutoSizeUtils.dp2px(getContext(),120));
+            tabView.setHeight(AutoSizeUtils.dp2px(getContext(),115));
             tab.setCustomView(tabView);
             if (0  == i){
                 mTaxiOrderTab.addTab(tab,true);