网约车 调试代码同步

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java

@@ -104,7 +104,7 @@ class MogoOCHTaxiModel {
      */
     private int mRetryCounter = 0;
 
-    private int mOCHRHCarstatus = -1; // 1 已出车
+    private int mOCHRHCarstatus = -1;
 
     private Object readResolve() {
         // 阻止反序列化，必须实现 Serializable 接口

OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java

@@ -22,6 +22,7 @@ import com.mogo.och.taxi.OCHOrderStatusCallback;
 import com.mogo.och.taxi.R;
 import com.mogo.och.view.SlidePanelView;
 import com.mogo.service.adas.IMogoAdasOCHCallback;
+import com.mogo.service.adas.entity.AdasOCHData;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.StatusDescriptor;
 import com.mogo.utils.logger.Logger;
@@ -38,6 +39,7 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
         IMogoOCHTaxiArriveCallback,
         IMogoADASAutoPilotStatusChangedListener,
         IOperationChangedListener,
+        IMogoAdasOCHCallback,
         IMogoCarLocationChangedListener2 {
 
     public static final String TAG = "OCHTaxiFragment";
@@ -416,4 +418,23 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
             updateOrderStatus();
         });
     }
+
+    @Override
+    public void onArriveAt(AdasOCHData data) {
+
+    }
+
+    @Override
+    public void onStateChanged(int state, String reason) {
+        Logger.d( TAG, "onStateChange: " + state );
+        switch ( state ) {
+            case IMogoAdasOCHCallback.STATUS_AUTOPILOT_ENABLE:
+                hideSlidePanel();
+                break;
+            case IMogoAdasOCHCallback.STATUS_AUTOPILOT_RUNNING:
+                break;
+            default:
+                break;
+        }
+    }
 }

app/src/main/java/com/mogo/launcher/MogoApplication.java

@@ -177,7 +177,8 @@ public class MogoApplication extends AbsMogoApplication {
                 break;
         }
         // 设置应用服务AppId  长链、鉴权
-        clientConfig.setServiceAppId("com.mogo.launcher");
+//        clientConfig.setServiceAppId("com.mogo.launcher");
+        clientConfig.setServiceAppId("com_mogo_launcher");
         // 设置AI云平台分配给三方应用的签名密钥，需要从AI云平台申请
         // 设置车机设备的唯一标识（这些表识必须是通过后台录入的设备）
         clientConfig.setThirdPartyDeviceId(Utils.getDevicesId());

gradle.properties

@@ -158,19 +158,19 @@ LOGLIB_VERSION = 1.0.4
 
 ######## MogoAiCloudSDK Version
 # 网络请求
-MOGO_NETWORK_VERSION=1.1.15
+MOGO_NETWORK_VERSION=1.1.18
 # 鉴权
-MOGO_PASSPORT_VERSION=1.1.15
+MOGO_PASSPORT_VERSION=1.1.18
 # 常链接
-MOGO_SOCKET_VERSION=1.1.15
+MOGO_SOCKET_VERSION=1.1.18
 # 数据采集
-MOGO_REALTIME_VERSION=1.1.15
+MOGO_REALTIME_VERSION=1.1.18
 # 探路，道路事件发布，获取
-MOGO_TANLU_VERSION=1.1.15
+MOGO_TANLU_VERSION=1.1.18
 # 直播推流
-MOGO_LIVE_VERSION=1.1.15
+MOGO_LIVE_VERSION=1.1.18
 # 直播拉流
-MOGO_TRAFFICLIVE_VERSION=1.1.15
+MOGO_TRAFFICLIVE_VERSION=1.1.18
 #ADAS HIGHT
 MOGO_ADASHIGH_VERSION=1.1.3
 
@@ -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.53
+MAP_SDK_VERSION=1.0.0-vr-8.5.55