diff --git a/app/src/main/java/com/mogo/cloud/MoGoApplication.java b/app/src/main/java/com/mogo/cloud/MoGoApplication.java index 34e1e37..91e6980 100644 --- a/app/src/main/java/com/mogo/cloud/MoGoApplication.java +++ b/app/src/main/java/com/mogo/cloud/MoGoApplication.java @@ -40,11 +40,11 @@ public class MoGoApplication extends MultiDexApplication { // 设置网络环境:HTTP_DNS_ENV_QA、HTTP_DNS_ENV_RELEASE、HTTP_DNS_ENV_DEV clientConfig.setNetMode(MogoHttpDnsConfig.HTTP_DNS_ENV_QA); // 设置是否是第三APP登录 - clientConfig.setThirdLogin(true); + clientConfig.setThirdLogin(false); // 设置是否输出日志 clientConfig.setShowDebugLog(true); // 设置从蘑菇AI开放平台获取的APPKey - clientConfig.setThirdPartyAppKey("ipacwivu"); + clientConfig.setThirdPartyAppKey("wbvpzgar"); // 设置AI云平台分配给三方应用的签名密钥,需要从AI云平台申请 clientConfig.setThirdPartySignSecret("y5VajBH+sTHonJP2a5Uh6uDZcK0fxNB5ORHmbg9B3V0="); // 设置车机设备的唯一标识(这些表识必须是通过后台录入的设备) diff --git a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java index 8e07f5c..2f4c1a8 100644 --- a/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java +++ b/foudations/mogo-live/src/main/java/com/mogo/cloud/live/manager/LiveStreamManagerImpl.java @@ -29,7 +29,7 @@ public class LiveStreamManagerImpl implements ILiveStreamManager { private final Context mContext; // 循环上报摄像头可直播状态间隔时间 - private static final int PUSH_CAM_TIME = 10 * 60 * 1000; + private static final int PUSH_CAM_TIME = 10 * 30 * 1000; private static volatile int sCam1LiveStatus = 0, sCam2LiveStatus = 0; private static volatile int sCam1AvailableStatus = 0, sCam2AvailableStatus = 0; private static final int PUSH_START = 0; // 开始 diff --git a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java index 867cb41..471aa55 100644 --- a/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java +++ b/foudations/mogo-socket/src/main/java/com/mogo/cloud/socket/SocketManager.java @@ -84,7 +84,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { .setChannelId(SocketServicesConstants.SOCKET_CHANNEL_ID) .setOpenAnalytics(true) // TODO 这里先用设备ID,原因是因为后台分配的SN与蘑菇自研车机SN不符合导致在线及推送有问题 - .setSn(cloudClientConfig.getSn()) + .setSn(cloudClientConfig.getThirdPartyDeviceId()) .setToken(cloudClientConfig.getToken()) .setAuthPubKey(cloudClientConfig.getAuthPubKey()) .setDebug(cloudClientConfig.isShowDebugLog()); @@ -120,7 +120,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { @Override public void sendMsg(String appId, int headerType, MsgBody body, IMogoCloudSocketMsgAckListener listener) { Logger.d(TAG, "sendMsg msgId : " + body.getMsgId()); - final byte[] pb = convertToPBBytes(body.getMsgType(), body.getContent().toString().getBytes()); + final byte[] pb = convertToPBBytes(body.getMsgType(), (byte[])body.getContent()); SocketClient.getInstance().sendData(appId, MogoCommon.Product.mogoBussiness.getNumber(), pb, headerType, true, body.getMsgId()); mAckListeners.put(body.getMsgId(), listener); } diff --git a/gradle.properties b/gradle.properties index 92d0735..df1f2f1 100644 --- a/gradle.properties +++ b/gradle.properties @@ -30,20 +30,20 @@ PASSWORD=xintai2018 RELEASE=true # AI CLOUD 云平台 # 工具类 -MOGO_UTILS_VERSION=1.0.24-SNAPSHOT +MOGO_UTILS_VERSION=1.0.25-SNAPSHOT # 网络请求 -MOGO_NETWORK_VERSION=1.0.24-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.25-SNAPSHOT # 网络DNS -MOGO_HTTPDNS_VERSION=1.0.24-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.25-SNAPSHOT # 鉴权 -MOGO_PASSPORT_VERSION=1.0.24-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.25-SNAPSHOT # 常链接 -MOGO_SOCKET_VERSION=1.0.24-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.25-SNAPSHOT # 数据采集 -MOGO_REALTIME_VERSION=1.0.24-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.25-SNAPSHOT # 探路,道路事件发布,获取 -MOGO_TANLU_VERSION=1.0.24-SNAPSHOT +MOGO_TANLU_VERSION=1.0.25-SNAPSHOT # 直播推流 -MOGO_LIVE_VERSION=1.0.24-SNAPSHOT +MOGO_LIVE_VERSION=1.0.25-SNAPSHOT # 直播拉流 -MOGO_TRAFFICLIVE_VERSION=1.0.24-SNAPSHOT +MOGO_TRAFFICLIVE_VERSION=1.0.25-SNAPSHOT