diff --git a/app/build.gradle b/app/build.gradle index 2c6070f..bf15055 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -19,7 +19,7 @@ android { } buildTypes { - debug{ + debug { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } @@ -40,19 +40,16 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout - - if (Boolean.valueOf(RELEASE)) { - implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" - implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}" - implementation "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}" - } else { - implementation project(":foudations:mogo-socket") - implementation project(":foudations:mogo-network") - implementation project(path: ':modules:mogo-tanlu') - } - implementation rootProject.ext.dependencies.rxjava implementation rootProject.ext.dependencies.rxandroid - implementation project(path: ':modules:mogo-realtime') + + if (Boolean.valueOf(RELEASE)) { + implementation "com.mogo.cloud:tanlu:${MOGO_TANLU_VERSION}" + implementation "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}" + } else { + implementation project(":modules:mogo-tanlu") + implementation project(":modules:mogo-realtime") + } + annotationProcessor 'com.elegant.spi:compiler:1.0.3' //编译时库 } \ No newline at end of file diff --git a/build.gradle b/build.gradle index 025df73..c5facce 100644 --- a/build.gradle +++ b/build.gradle @@ -17,7 +17,7 @@ buildscript { jcenter() } dependencies { - classpath "com.android.tools.build:gradle:4.0.2" + classpath 'com.android.tools.build:gradle:3.5.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" classpath "org.jetbrains.kotlin:kotlin-android-extensions:$kotlin_version" // 对kotlin生成doc diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index 8c2fb1d..38e4721 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -34,7 +34,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:httpdns:${MOGO_HTTPDNS_VERSION}" } else { - api project(path: ':foudations:mogo-httpdns') + api project(':foudations:mogo-httpdns') } } diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java index ab61de0..d822dbf 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClientConfig.java @@ -25,6 +25,10 @@ public class MoGoAiCloudClientConfig { * APP key */ private String thirdPartyAppKey = ""; + /** + * （可选，有则传，有默认值；为后续扩展使用，第三方车机可能使用自定义的pub_key, 此key由server端分配） + */ + private String authPubKey = ""; /** * 签名信息 @@ -102,6 +106,24 @@ public class MoGoAiCloudClientConfig { this.thirdPartyAppKey = thirdPartyAppKey; } + /** + * 获取授权公钥匙 + * + * @return 授权公钥匙 + */ + public String getAuthPubKey() { + return authPubKey; + } + + /** + * 设置授权公钥匙 + * + * @param authPubKey 授权公钥匙 + */ + public void setAuthPubKey(String authPubKey) { + this.authPubKey = authPubKey; + } + /** * 获取AI云平台分配给三方应用的签名密钥，需要从AI云平台申请 * @@ -289,6 +311,7 @@ public class MoGoAiCloudClientConfig { "sNetMode=" + sNetMode + ", thirdPartyDeviceId='" + thirdPartyDeviceId + '\'' + ", thirdPartyAppKey='" + thirdPartyAppKey + '\'' + + ", authPubKey='" + authPubKey + '\'' + ", thirdPartySignSecret='" + thirdPartySignSecret + '\'' + ", thirdLogin=" + thirdLogin + ", isShowDebugLog=" + isShowDebugLog + diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle index 959b1cc..813c376 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -26,10 +26,10 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - // 长链 - api 'com.zhidao.socket:built-in-socket:1.0.21' - // 上报位置 - implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.8' + // 长链 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956182 + api 'com.zhidao.socket:built-in-socket:1.0.22' + // 上报位置 http://wiki.zhidaohulian.com/pages/viewpage.action?pageId=48956200 + implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.9' if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" 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 bb04f6f..7bdb57a 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 @@ -88,6 +88,7 @@ public class SocketManager implements IMogoCloudSocketManager, Callback { .setOpenAnalytics(true) .setSn(cloudClientConfig.getSn()) .setToken(cloudClientConfig.getToken()) + .setAuthPubKey(cloudClientConfig.getAuthPubKey()) .setDebug(cloudClientConfig.isShowDebugLog()); SocketClient.getInstance().start(context); } diff --git a/gradle.properties b/gradle.properties index bacc2f0..d0e7864 100644 --- a/gradle.properties +++ b/gradle.properties @@ -25,9 +25,9 @@ PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 RELEASE=false # AI CLOUD 云平台 -MOGO_NETWORK_VERSION=1.0.7-SNAPSHOT -MOGO_HTTPDNS_VERSION=1.0.7-SNAPSHOT -MOGO_PASSPORT_VERSION=1.0.7-SNAPSHOT -MOGO_SOCKET_VERSION=1.0.7-SNAPSHOT -MOGO_REALTIME_VERSION=1.0.7-SNAPSHOT -MOGO_TANLU_VERSION=1.0.7-SNAPSHOT +MOGO_NETWORK_VERSION=1.0.8-SNAPSHOT +MOGO_HTTPDNS_VERSION=1.0.8-SNAPSHOT +MOGO_PASSPORT_VERSION=1.0.8-SNAPSHOT +MOGO_SOCKET_VERSION=1.0.8-SNAPSHOT +MOGO_REALTIME_VERSION=1.0.8-SNAPSHOT +MOGO_TANLU_VERSION=1.0.8-SNAPSHOT diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2a41cbc..44817cf 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/modules/mogo-realtime/build.gradle b/modules/mogo-realtime/build.gradle index 804401b..ed2364d 100644 --- a/modules/mogo-realtime/build.gradle +++ b/modules/mogo-realtime/build.gradle @@ -28,15 +28,16 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - implementation project(path: ':foudations:mogo-passport') api rootProject.ext.dependencies.spi if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" implementation "com.mogo.cloud:socket:${MOGO_SOCKET_VERSION}" } else { - implementation project(":foudations:mogo-socket") implementation project(":foudations:mogo-network") + implementation project(":foudations:mogo-socket") } -} \ No newline at end of file +} + +apply from: new File(rootProject.rootDir, "gradle/upload.gradle").toString() diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index ca9507d..6db1072 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -38,9 +38,9 @@ dependencies { implementation rootProject.ext.dependencies.videoprocessor if (Boolean.valueOf(RELEASE)) { - implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" + api "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" } else { - implementation project(path: ':foudations:mogo-network') + api project(':foudations:mogo-network') } }