From 9455480d1b7ddee24ad2d9ea151459eb8bc65158 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Feb 2021 14:48:47 +0800 Subject: [PATCH 1/8] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=86upload-sdk=20?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86setAuthPubKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../passport/MoGoAiCloudClientConfig.java | 23 +++++++++++++++++++ foudations/mogo-socket/build.gradle | 4 ++-- .../com/mogo/cloud/socket/SocketManager.java | 1 + 3 files changed, 26 insertions(+), 2 deletions(-) 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..3d816a0 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -27,9 +27,9 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) // 长链 - api 'com.zhidao.socket:built-in-socket:1.0.21' + api 'com.zhidao.socket:built-in-socket:1.0.22' // 上报位置 - implementation 'com.zhidao.locupload:loc-upload-sdk:1.1.8' + 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 b13bfea..2d506ee 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); } From 8cd93199399afc708b1215027bda8353afa82e79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Feb 2021 14:50:18 +0800 Subject: [PATCH 2/8] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E4=BA=86=E5=86=85?= =?UTF-8?q?=E9=83=A8=E4=BE=9D=E8=B5=96=E7=9A=84wiki=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/mogo-socket/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/foudations/mogo-socket/build.gradle b/foudations/mogo-socket/build.gradle index 3d816a0..813c376 100644 --- a/foudations/mogo-socket/build.gradle +++ b/foudations/mogo-socket/build.gradle @@ -26,9 +26,9 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) - // 长链 + // 长链 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)) { From fd1bbbca8881c14fa16917b564224e4b7ed8e9ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Feb 2021 15:14:35 +0800 Subject: [PATCH 3/8] =?UTF-8?q?=E4=B8=8A=E4=BC=A0Maven?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 11 ++++++----- foudations/mogo-network/build.gradle | 2 +- foudations/mogo-passport/build.gradle | 2 +- gradle.properties | 14 +++++++------- modules/mogo-realtime/build.gradle | 7 ++++--- modules/mogo-tanlu/build.gradle | 2 +- 6 files changed, 20 insertions(+), 18 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 2c6070f..1de1985 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,20 @@ dependencies { implementation rootProject.ext.dependencies.androidxappcompat implementation rootProject.ext.dependencies.androidxconstraintlayout + implementation rootProject.ext.dependencies.rxjava + implementation rootProject.ext.dependencies.rxandroid 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}" + implementation "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}" } else { implementation project(":foudations:mogo-socket") implementation project(":foudations:mogo-network") - implementation project(path: ':modules:mogo-tanlu') + implementation project(":modules:mogo-tanlu") + implementation project(":modules:mogo-realtime") } - implementation rootProject.ext.dependencies.rxjava - implementation rootProject.ext.dependencies.rxandroid - implementation project(path: ':modules:mogo-realtime') annotationProcessor 'com.elegant.spi:compiler:1.0.3' //编译时库 } \ No newline at end of file diff --git a/foudations/mogo-network/build.gradle b/foudations/mogo-network/build.gradle index 9ae7b11..074fcc2 100644 --- a/foudations/mogo-network/build.gradle +++ b/foudations/mogo-network/build.gradle @@ -54,7 +54,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" } else { - api project(path: ':foudations:mogo-passport') + api project(':foudations:mogo-passport') } } \ No newline at end of file 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/gradle.properties b/gradle.properties index bacc2f0..294e058 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,11 +23,11 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=false +RELEASE=true # 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/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..f975631 100644 --- a/modules/mogo-tanlu/build.gradle +++ b/modules/mogo-tanlu/build.gradle @@ -40,7 +40,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { implementation "com.mogo.cloud:network:${MOGO_NETWORK_VERSION}" } else { - implementation project(path: ':foudations:mogo-network') + implementation project(':foudations:mogo-network') } } From 0eeffcf7850c5a5aa9dd3f02d9a07c965a9961a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Feb 2021 15:22:32 +0800 Subject: [PATCH 4/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B5=8B=E8=AF=95demo?= =?UTF-8?q?=E7=9A=84=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 4 ---- 1 file changed, 4 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 1de1985..bf15055 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -44,13 +44,9 @@ dependencies { implementation rootProject.ext.dependencies.rxandroid 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}" implementation "com.mogo.cloud:realtime:${MOGO_REALTIME_VERSION}" } else { - implementation project(":foudations:mogo-socket") - implementation project(":foudations:mogo-network") implementation project(":modules:mogo-tanlu") implementation project(":modules:mogo-realtime") } From 726aa40b5132a22811fc7b76669b82b0b6c8d239 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 1 Feb 2021 15:38:12 +0800 Subject: [PATCH 5/8] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=AC=E5=9C=B0?= =?UTF-8?q?=E8=AF=9D=E4=BE=9D=E8=B5=96=E5=8F=AF=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- foudations/mogo-network/build.gradle | 2 +- gradle.properties | 2 +- modules/mogo-tanlu/build.gradle | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/foudations/mogo-network/build.gradle b/foudations/mogo-network/build.gradle index 074fcc2..9ae7b11 100644 --- a/foudations/mogo-network/build.gradle +++ b/foudations/mogo-network/build.gradle @@ -54,7 +54,7 @@ dependencies { if (Boolean.valueOf(RELEASE)) { api "com.mogo.cloud:passport:${MOGO_PASSPORT_VERSION}" } else { - api project(':foudations:mogo-passport') + api project(path: ':foudations:mogo-passport') } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 294e058..d0e7864 100644 --- a/gradle.properties +++ b/gradle.properties @@ -23,7 +23,7 @@ SNAPSHOT_REPOSITORY_URL=http://nexus.zhidaoauto.com/repository/maven-snapshots/ USERNAME=xintai PASSWORD=xintai2018 # 编译模式: false - 依赖本地版本， true - 依赖 maven 版本 -RELEASE=true +RELEASE=false # AI CLOUD 云平台 MOGO_NETWORK_VERSION=1.0.8-SNAPSHOT MOGO_HTTPDNS_VERSION=1.0.8-SNAPSHOT diff --git a/modules/mogo-tanlu/build.gradle b/modules/mogo-tanlu/build.gradle index f975631..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(':foudations:mogo-network') + api project(':foudations:mogo-network') } } From 76f32e5245bdd56dd8ab6b83d87797f51263ee72 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 1 Feb 2021 16:36:31 +0800 Subject: [PATCH 6/8] =?UTF-8?q?=E6=B5=8B=E8=AF=95=E4=BB=A3=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/mogo/cloud/RealTimeActivity.java | 8 ++++++++ .../java/com/mogo/cloud/network/NetworkActivity.java | 4 ++-- app/src/main/res/layout/activity_real_time.xml | 12 ++++++++++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java index c06b9c7..a6a8f5c 100644 --- a/app/src/main/java/com/mogo/cloud/RealTimeActivity.java +++ b/app/src/main/java/com/mogo/cloud/RealTimeActivity.java @@ -24,6 +24,9 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM private Button snapshotStartButton; private Button snapshotStopButton; + private TextView mTextView; + private TextView mStopTextView; + @Override protected void onCreate(@Nullable Bundle savedInstanceState) { @@ -41,6 +44,9 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM snapshotStopButton.setOnClickListener(view -> { stopRealTimeService(); }); + + mTextView = findViewById(R.id.upResult); + mStopTextView = findViewById(R.id.stopResult); } private void setConfig() { @@ -50,6 +56,7 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM public void stopRealTimeService() { MoGoAiCloudRealTime.unRegisterOnMsgListener(this); MoGoAiCloudRealTime.stopRealTime(); + mStopTextView.setText("stopRealTimeService"); } @Override @@ -61,6 +68,7 @@ public class RealTimeActivity extends AppCompatActivity implements IMogoCloudOnM @Override public void onMsgSend(long id) { Log.i(TAG, "send msg id : " + id); + mTextView.setText("send msg id :"+String.valueOf(id)); } @Override diff --git a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java index 28ea228..afd5a68 100644 --- a/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java +++ b/app/src/main/java/com/mogo/cloud/network/NetworkActivity.java @@ -44,8 +44,8 @@ public class NetworkActivity extends AppCompatActivity { @Override public void onClick(View view) { tvResult.setText("结果显示"); - queryRoadData("ZD802C1938L10797"); -// queryHelpSignal("F803EB2046PZD00006"); + //queryRoadData("ZD802C1938L10797"); + queryHelpSignal("F803EB2046PZD00006"); } }); } diff --git a/app/src/main/res/layout/activity_real_time.xml b/app/src/main/res/layout/activity_real_time.xml index d9d8e3a..0a78f81 100644 --- a/app/src/main/res/layout/activity_real_time.xml +++ b/app/src/main/res/layout/activity_real_time.xml @@ -13,6 +13,12 @@ android:layout_marginTop="20dp" android:text="开启实时数据上传" /> + +