From 56bca9eedb68af6f2f4630d2389b9399d8c8cda1 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 25 Jan 2021 17:36:20 +0800 Subject: [PATCH 1/7] no message --- .../com/mogo/realtime/Imp/RealTimeDelegateManager.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java index 8c4e603..6dc1990 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java @@ -1,5 +1,6 @@ package com.mogo.realtime.Imp; +import android.content.Context; import com.elegant.spi.AbstractDelegateManager; import com.mogo.cloud.passport.MoGoAiCloudClient; @@ -12,7 +13,7 @@ import com.mogo.realtime.Interface.RealTimeProvider; */ class RealTimeDelegateManager extends AbstractDelegateManager { private static RealTimeDelegateManager sInstance = null; - private Class mRealTimeProvider = null; + private RealTimeProvider mRealTimeProvider = null; public static RealTimeDelegateManager getInstance() { if (sInstance == null) { @@ -26,12 +27,13 @@ class RealTimeDelegateManager extends AbstractDelegateManager } public RealTimeDelegateManager() { - loadDelegateClasses(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener>() { + loadDelegates(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener() { @Override - public void onDelegate(String unit, Class p) { + public void onDelegate(String unit, RealTimeProvider p) { mRealTimeProvider = p; } }); + } } From c9aeebe053b1c821fffb6d50afb60a2243b2c3d4 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 25 Jan 2021 17:53:48 +0800 Subject: [PATCH 2/7] Revert "no message" This reverts commit 56bca9eedb68af6f2f4630d2389b9399d8c8cda1. --- .../com/mogo/realtime/Imp/RealTimeDelegateManager.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java index 6dc1990..8c4e603 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeDelegateManager.java @@ -1,6 +1,5 @@ package com.mogo.realtime.Imp; -import android.content.Context; import com.elegant.spi.AbstractDelegateManager; import com.mogo.cloud.passport.MoGoAiCloudClient; @@ -13,7 +12,7 @@ import com.mogo.realtime.Interface.RealTimeProvider; */ class RealTimeDelegateManager extends AbstractDelegateManager { private static RealTimeDelegateManager sInstance = null; - private RealTimeProvider mRealTimeProvider = null; + private Class mRealTimeProvider = null; public static RealTimeDelegateManager getInstance() { if (sInstance == null) { @@ -27,13 +26,12 @@ class RealTimeDelegateManager extends AbstractDelegateManager } public RealTimeDelegateManager() { - loadDelegates(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener() { + loadDelegateClasses(MoGoAiCloudClient.getInstance().getContext(), RealTimeProvider.class, new DelegateListener>() { @Override - public void onDelegate(String unit, RealTimeProvider p) { + public void onDelegate(String unit, Class p) { mRealTimeProvider = p; } }); - } } From 35c41fe23b373f0ec16d7e8d4b042a0cedb917ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 25 Jan 2021 18:13:31 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E4=B8=8A=E4=BC=A0=E6=9C=80=E6=96=B0maven?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E5=B9=B6=E4=BE=9D=E8=B5=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- build.gradle | 1 + foudations/mogo-httpdns/build.gradle | 1 + gradle.properties | 2 +- upload.sh | 10 +++++++++- 5 files changed, 13 insertions(+), 3 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 10608e0..42fab5f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@ diff --git a/foudations/mogo-passport/build.gradle b/foudations/mogo-passport/build.gradle index d51b6a0..7a61ee2 100644 --- a/foudations/mogo-passport/build.gradle +++ b/foudations/mogo-passport/build.gradle @@ -8,7 +8,7 @@ android { targetSdkVersion rootProject.ext.android.targetSdkVersion versionCode 1 - versionName "1.0" + versionName "${MOGO_PASSPORT_VERSION}" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" consumerProguardFiles "consumer-rules.pro" diff --git a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java index bf16e12..33a587f 100644 --- a/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java +++ b/foudations/mogo-passport/src/main/java/com/mogo/cloud/passport/MoGoAiCloudClient.java @@ -79,6 +79,9 @@ public class MoGoAiCloudClient { @Override public void onSuccess(TokenData.TokenResult result) { Log.i(TAG, "═════════════════════════════════════"); + Log.i(TAG, "║ PassportVersion：" + com.mogo.cloud.passport.BuildConfig.VERSION_NAME); + Log.i(TAG, "║ HttpDnsVersion：" + com.mogo.cloud.httpdns.BuildConfig.VERSION_NAME); + Log.i(TAG, "║ ThirdLoginVersion：" + com.zhidao.thirdlogin.BuildConfig.VERSION_NAME); Log.i(TAG, "║ MoGo鉴权成功 "); Log.i(TAG, "║ SN：" + result.sn); Log.i(TAG, "║ Token：" + result.token); From a3b70f750fc10cc43384e97061d04e02d7b1bc00 Mon Sep 17 00:00:00 2001 From: liujing Date: Mon, 25 Jan 2021 18:26:40 +0800 Subject: [PATCH 5/7] no message --- .../main/java/com/mogo/realtime/Imp/RealTimeProviderImp.java | 1 + .../mogo/realtime/constant/SimpleLocationCorrectStrategy.java | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeProviderImp.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeProviderImp.java index 11aa066..e80c79a 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeProviderImp.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/Imp/RealTimeProviderImp.java @@ -2,6 +2,7 @@ package com.mogo.realtime.Imp; import android.content.Context; +import com.elegant.spi.annotations.Service; import com.mogo.cloud.socket.IMogoCloudSocketOnMessageListener; import com.mogo.realtime.Interface.RealTimeProvider; import com.mogo.realtime.entity.ADASRecognizedResult; diff --git a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java index 9911d8d..796d9f6 100644 --- a/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java +++ b/modules/mogo-realtime/src/main/java/com/mogo/realtime/constant/SimpleLocationCorrectStrategy.java @@ -61,7 +61,7 @@ public class SimpleLocationCorrectStrategy { try { float targetDistance = (float) (lastLocation.getSpeed() * (SystemClock.elapsedRealtime() - anchorTime) / 1000) + TARGET_DISTANCE_DEVIATION; - float distance = SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); + float distance = 0;//SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); Logger.d(TAG, "准备计算{ lastInfo: " + lastLocation.print() + " info: " + info.print() + " targetDistance: " + targetDistance + " distance : " + distance + "}"); if (distance <= targetDistance) { @@ -121,7 +121,7 @@ public class SimpleLocationCorrectStrategy { try { float targetDistance = (float) (lastLocation.getSpeed() * (SystemClock.elapsedRealtime() - anchorTime) / 1000) + TARGET_DISTANCE_DEVIATION; - float distance = SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); + float distance = 0;//SocketHandler.getInstance().getRealTimeProvider().getDistanceBetweenTwoPoints(); Logger.d(TAG, "异常定位点\n准备计算{ lastInfo: " + lastLocation.print() + " info: " + info.print() + " targetDistance: " + targetDistance + " distance : " + distance + "}"); // 按照上一个点的方向和速度，计算下一个点的位置，下一个点除坐标点外，其余数据与上一个点相同 From 34f3e679409a4b511d372a18fae14c307b5d56a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 25 Jan 2021 18:33:55 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E6=9B=B4=E6=96=B0maven=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .idea/misc.xml | 2 +- foudations/mogo-httpdns/build.gradle | 2 +- foudations/mogo-socket/build.gradle | 2 +- gradle.properties | 12 ++++++------ modules/mogo-realtime/build.gradle | 2 +- modules/mogo-tanlu/build.gradle | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.idea/misc.xml b/.idea/misc.xml index 42fab5f..32e44eb 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -13,7 +13,7 @@