Merge branch 'dev_robotaxi-d-app-module_2100_yangyakun_2.10.0' into dev_robotaxi-d-app-module_2100_220816_2.10.0

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

@@ -189,10 +189,7 @@ public class TaxiModel {
                 CallerLogger.INSTANCE.d(M_TAXI + TAG, "Undeliverable exception");
             }
         });
-
-        if (NetworkUtils.isConnected(mContext)) {
-            queryCarStatus();
-        }
+        queryCarStatus();
     }
 
     public void release() {
@@ -276,7 +273,9 @@ public class TaxiModel {
                             //更新view
                             CallerLogger.INSTANCE.d(M_TAXI + TAG, "changeCarStatus:" + StatusManager.getLoginStatus());
                             startOrStopOrderLoop(StatusManager.isLogin());
-                            mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
+                            if(mCarStatusCallback!=null) {
+                                mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
+                            }
                             String role = "";
                             if (TaxiDriverRoleEnum.DEMO.getCode() == data.data.purpose) {
                                 role = TaxiConst.DEMO_USER;
@@ -297,20 +296,26 @@ public class TaxiModel {
                         } else {
                             ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
                         }
-//                        queryCarStatus();
+                        queryCarStatus();
+                        if(mCarStatusCallback!=null) {
+                            mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
+                        }
                     }
 
                     @Override
                     public void onFail(int code, String msg) {
                         ToastUtils.showShort(code + "," + msg);
-//                        queryCarStatus();
+                        queryCarStatus();
+                        if(mCarStatusCallback!=null) {
+                            mCarStatusCallback.onCarLoginStatusChange(StatusManager.isLogin());
+                        }
                     }
                 });
     }
 
     //更新出车收车状态
     public void updateCarStatus() {
-        if (StatusManager.getLoginStatus().equals(TaxiLoginStatusEnum.None)) {
+        if(!StatusManager.isLogin()){
             queryCarStatus();
             return;
         }

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

@@ -41,6 +41,8 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
 
     private static final String TAG = TaxiPresenter.class.getSimpleName();
 
+    private boolean isFirstShow = true;
+
     public TaxiPresenter(TaxiFragment view) {
         super(view);
         TaxiModel.getInstance().init(AbsMogoApplication.getApp());
@@ -61,6 +63,16 @@ public class TaxiPresenter extends Presenter<TaxiFragment> implements ITaxiADASS
         TaxiModel.getInstance().release();
     }
 
+    @Override
+    public void onResume(@NonNull LifecycleOwner owner) {
+        super.onResume(owner);
+        if(isFirstShow){
+            isFirstShow = false;
+        }else {
+            TaxiModel.getInstance().queryCarStatus();
+        }
+    }
+
     private void initListeners() {
         TaxiModel.getInstance().setADASStatusCallback(this);
         TaxiModel.getInstance().setCarStatusCallback(this);

OCH/mogo-och-taxi/src/main/res/layout/taxi_login_view.xml

@@ -85,7 +85,7 @@
         android:gravity="center_vertical"
         android:imeOptions="actionDone"
         android:paddingStart="30px"
-        android:maxLength="8"
+        android:maxLength="4"
         android:layout_width="518px"
         android:layout_height="136px"/>