diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java index 7c635f3341..2a36c5677c 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java @@ -133,13 +133,13 @@ public class MogoOCHTaxiModelNew { mContext = context.getApplicationContext(); initListeners(); - IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); - apis.getSocketManagerApi(mContext).init(mContext, DebugConfig.getSocketAppId()); +// IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); +// apis.getSocketManagerApi(mContext).init(mContext, DebugConfig.getSocketAppId()); // TODO: 2021/8/27 因需要通过此回调的location进行坐标上传，暂改为全程监听，退出后再反注册， // 待后续整体调整location获取来源 - if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { - apis.getLocationInfoApi().start(); - } +// if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) { +// apis.getLocationInfoApi().start(); +// } //2022.1.28 // 调用Disposable.dispose() 时候会出现InterruptedException 导致出现崩溃 diff --git a/app/build.gradle b/app/build.gradle index 050d2d0e2c..441eafb4a9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -15,12 +15,12 @@ if (!isAndroidTestBuild()) { logLevel "DEBUG" } } -//if (!isAndroidTestBuild()) { -// apply plugin: 'chain.log.hook' -// hooklog{ -// enableLoggerToServer true -// } -//} +if (!isAndroidTestBuild()) { + apply plugin: 'chain.log.hook' + hooklog{ + enableLoggerToServer true + } +} //if (!isAndroidTestBuild()) { // apply plugin: 'apm-plugin' diff --git a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java index fec8e94be5..5163b42f77 100644 --- a/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java +++ b/core/function-impl/mogo-core-function-main/src/main/java/com/mogo/eagle/core/function/main/MainMoGoApplication.java @@ -187,6 +187,8 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { clientConfig.setThirdPartyDeviceId(Utils.getDevicesId()); // 设置循环检测间隔时间（每隔2小时loop一次httpDnsConfig） clientConfig.setLoopCheckDelay(60 * 60 * 2 * 1000); + //设置长链接的secretKey //todo 通过SHA1和包名找中台服务生成，后续包名分渠道,需要做对应操作 + clientConfig.setSecretKey("YMj2VFDFxJ3Q4gNoZceJ"); //连接ami connectAmiIp(); @@ -234,6 +236,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { @Override public void onTokenGot(String token, String sn) { CallerLogger.INSTANCE.d(M_MAIN + TAG, "onTokenGot "); + clientConfig.setToken(token); // 异步初始化NetConfig asyncInit(); // HttpDns ttl回调 --- socketTTL @@ -277,6 +280,7 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { private void startSocketService() { CallerLogger.INSTANCE.d(M_MAIN + TAG, "startSocketService"); IMogoServiceApis apis = MogoApisHandler.getInstance().getApis(); + MogoLocation location = CallerMapUIServiceManager.INSTANCE.getSingletonLocationClient(getApp()).getLastKnowLocation(); // 关闭长链服务 apis.getSocketManagerApi(getApplicationContext()).destroy(); apis.getSocketManagerApi(this).registerLifecycleListener(10020, new IMogoLifecycleListener() { @@ -299,7 +303,10 @@ public abstract class MainMoGoApplication extends AbsMogoApplication { } }); // 开启Socket长链服务 - apis.getSocketManagerApi(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId()); + double lat = location.getLatitude(); + double lon = location.getLongitude(); + CallerLogger.INSTANCE.d(M_MAIN + TAG,"emArrow lat : " + lat + " , lon : " + lon); + apis.getSocketManagerApi(getApplicationContext()).init(getApplicationContext(), DebugConfig.getSocketAppId(),lat,lon); } @Override diff --git a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java index 9ba6cd1ca1..56e6125ac1 100644 --- a/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java +++ b/foudations/mogo-aicloud-services-sdk/src/main/java/com/mogo/aicloud/services/socket/MogoAiCloudSocketManager.java @@ -8,13 +8,13 @@ import com.mogo.cloud.socket.IMogoCloudSocketMsgAckListener; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.cloud.socket.SocketManager; import com.mogo.cloud.socket.entity.MsgBody; -import com.mogo.cloud.socket.third.core.ConnectionLifecycleListener; import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.service.cloud.socket.IMogoLifecycleListener; import com.mogo.service.cloud.socket.IMogoMsgAckListener; import com.mogo.service.cloud.socket.IMogoOnMessageListener; import com.mogo.service.cloud.socket.IMogoSocketManager; import com.zhidao.ptech.connsvr.commom.protocol.MogoCommon; +import com.zhidao.socket.ConnectionLifecycleListener; import java.util.ArrayList; import java.util.List; @@ -70,9 +70,9 @@ public class MogoAiCloudSocketManager extends ConnectionLifecycleListener implem private final Map mAckListeners = new ConcurrentHashMap<>(); @Override - public void init(Context context, String appId) { + public void init(Context context, String appId, double lat, double lon) { this.mAppId = appId; - SocketManager.getInstance().init(context); + SocketManager.getInstance().init(context, lat, lon); SocketManager.getInstance().registerSocketConnCallback(this); } diff --git a/gradle.properties b/gradle.properties index 9539555c09..e4530c9ffa 100644 --- a/gradle.properties +++ b/gradle.properties @@ -63,23 +63,23 @@ SERVICE_CHAIN_VERSION=1.0.53 LOGLIB_VERSION=1.2.20 ######## MogoAiCloudSDK Version ######## # 网络请求 -MOGO_NETWORK_VERSION=1.3.32 +MOGO_NETWORK_VERSION=1.3.48 # 鉴权 -MOGO_PASSPORT_VERSION=1.3.32 +MOGO_PASSPORT_VERSION=1.3.48 # 常链接 -MOGO_SOCKET_VERSION=1.3.32 +MOGO_SOCKET_VERSION=1.3.48 # 数据采集 -MOGO_REALTIME_VERSION=1.3.32 +MOGO_REALTIME_VERSION=1.3.48 # 探路，道路事件发布，获取 -MOGO_TANLU_VERSION=1.3.32 +MOGO_TANLU_VERSION=1.3.48 # 直播推流 -MOGO_LIVE_VERSION=1.3.32 +MOGO_LIVE_VERSION=1.3.48 # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.3.32 +MOGO_TRAFFICLIVE_VERSION=1.3.48 # 定位服务 -MOGO_LOCATION_VERSION=1.3.32 +MOGO_LOCATION_VERSION=1.3.48 # 远程通讯模块 -MOGO_TELEMATIC_VERSION=1.3.32 +MOGO_TELEMATIC_VERSION=1.3.48 ######## MogoAiCloudSDK Version ######## # 自研地图 MAP_SDK_VERSION=2.0.9.4 @@ -155,5 +155,5 @@ MOGO_OCH_TAXI_VERSION=2.0.66 # mogoAiCloud sdk services MOGO_AICLOUD_SERVICES_SDK_VERSION=2.1.16.10 # v2x-sdk -MOGO_V2X_SDK_VERSION=1.3.32 +MOGO_V2X_SDK_VERSION=1.3.48 ################# 旧版本架构模块版本 ################# diff --git a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/socket/IMogoSocketManager.java b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/socket/IMogoSocketManager.java index b354eb9b07..a122ce173f 100644 --- a/services/mogo-service-api/src/main/java/com/mogo/service/cloud/socket/IMogoSocketManager.java +++ b/services/mogo-service-api/src/main/java/com/mogo/service/cloud/socket/IMogoSocketManager.java @@ -19,7 +19,7 @@ public interface IMogoSocketManager extends IProvider { * @param context 上下文 * @param appId 一般为包名，不参与通道的建立，一般用于发消息 */ - void init( Context context, String appId ); + void init( Context context, String appId , double lat, double lon); /** * 注册消息监听 diff --git a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java index 3a7fa0e5aa..24eac3c6df 100644 --- a/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java +++ b/services/mogo-service/src/main/java/com/mogo/service/impl/cloud/socket/MogoSocketManager.java @@ -26,9 +26,9 @@ public class MogoSocketManager implements IMogoSocketManager { private IMogoSocketManager mDelegate; @Override - public void init(Context context, String appId) { + public void init(Context context, String appId, double lat, double lon) { if (mDelegate != null) { - mDelegate.init(context, appId); + mDelegate.init(context, appId, lat, lon); } }