diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
index 589674a874..94c9432ca1 100644
--- a/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
+++ b/OCH/mogo-och-taxi-passenger/src/main/res/layout/taxi_p_setting_view.xml
@@ -18,17 +18,17 @@
app:layout_constraintTop_toTopOf="parent" />
@@ -75,17 +75,17 @@
app:layout_constraintTop_toBottomOf="@+id/tvSettingLight" />
diff --git a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
index c2f683500e..184b173cbb 100644
--- a/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
+++ b/core/function-impl/mogo-core-function-biz/src/main/java/com/mogo/eagle/function/biz/v2x/trafficlight/core/MogoTrafficLightManager.kt
@@ -3,6 +3,7 @@ package com.mogo.eagle.function.biz.v2x.trafficlight.core
import android.content.Context
import android.os.Handler
import android.os.HandlerThread
+import android.os.Looper
import com.mogo.eagle.core.data.biz.trafficlight.RoadIDResult
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightControl
import com.mogo.eagle.core.data.biz.trafficlight.TrafficLightResult
@@ -49,10 +50,8 @@ class MogoTrafficLightManager : IMoGoChassisLocationGCJ02Listener {
fun initServer(context: Context) {
mContext = context
CallerChassisLocationGCJ02ListenerManager.addListener(TAG, this)
- val thread = HandlerThread("v2x_traffic_light")
- thread.start()
mThreadHandler =
- TrafficLightThreadHandler(thread.looper, {
+ TrafficLightThreadHandler(Looper.getMainLooper(), {
//第一次查询路口时，如果红绿灯显示，则隐藏掉
if (firstLoopCrossRoad) {
CallerTrafficLightListenerManager.resetTrafficLightStatus()
diff --git a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt
index 0c14eff08c..4d20acf430 100644
--- a/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt
+++ b/core/function-impl/mogo-core-function-devatools/src/main/java/com/zhjt/mogo_core_function_devatools/mofang/MoFangCommandExecutor.kt
@@ -192,7 +192,7 @@ internal class MoFangCommandExecutor {
handler.removeMessages(MSG_WHAT_KEY_CODE_AL)
handler.sendMessage(Message.obtain().also {
it.what = MSG_WHAT_KEY_CODE_A
- it.obj = -1.0
+ it.obj = -1.2
})
linkedLog?.record(mapOf("发送[A]:${System.currentTimeMillis()}" to "${whatToString(MSG_WHAT_KEY_CODE_A)}"))
}
diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/RequestOptions.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/RequestOptions.java
index 3ebc77c468..c74aa4bb7e 100644
--- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/RequestOptions.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/RequestOptions.java
@@ -2,6 +2,7 @@ package com.mogo.eagle.core.network;
import android.content.Context;
+import android.view.KeyEvent;
import com.mogo.eagle.core.network.utils.Util;
@@ -96,7 +97,7 @@ public class RequestOptions {
}
public Object getCaller() {
- return caller;
+ return caller == null ? null : caller;
}
public Context getContext() {
diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java
index 3c5a354a61..694ce2bec2 100644
--- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/SubscribeImpl.java
@@ -28,7 +28,7 @@ public abstract class SubscribeImpl implements Observer {
}
private void onFinish() {
- if (!Util.checkAlive(mRequestOptions.getCaller())) {
+ if (Util.checkAlive(mRequestOptions.getCaller())) {
}
}
diff --git a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
index 397f5bc20d..aadb0d10db 100644
--- a/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
+++ b/core/mogo-core-network/src/main/java/com/mogo/eagle/core/network/utils/Util.java
@@ -15,30 +15,37 @@ import com.mogo.eagle.core.network.CallerNotAliveException;
public class Util {
- public static boolean checkAlive( Object caller ) {
- if ( caller instanceof Activity) {
- return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ? !( ( Activity ) caller ).isDestroyed() : !( ( Activity ) caller ).isFinishing();
- } else if ( caller instanceof Fragment) {
- return ( ( Fragment ) caller ).isAdded();
- } else if ( caller instanceof androidx.fragment.app.Fragment ) {
- return ( ( androidx.fragment.app.Fragment ) caller ).isAdded();
- } else if ( caller instanceof View) {
- return true;
- } else if ( caller instanceof Dialog) {
- return ( ( Dialog ) caller ).getWindow() != null;
- } else if ( caller instanceof PopupWindow) {
- return ( ( PopupWindow ) caller ).getContentView() != null;
+ public static boolean checkAlive(Object caller ) {
+ if ( caller == null){
+ return false;
+ }
+ if ( caller instanceof Activity) {
+ return Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 ? ((Activity) caller).isDestroyed() : ((Activity) caller).isFinishing();
+ } else if ( caller instanceof Fragment) {
+ return !((Fragment) caller).isAdded();
+ } else if ( caller instanceof androidx.fragment.app.Fragment ) {
+ return !((androidx.fragment.app.Fragment) caller).isAdded();
+ } else if ( caller instanceof View) {
+ return false;
+ } else if ( caller instanceof Dialog) {
+ return ((Dialog) caller).getWindow() == null;
+ } else if ( caller instanceof PopupWindow) {
+ return ((PopupWindow) caller).getContentView() == null;
+ } else {
+ return false;
}
- return caller != null;
}
public static void assertCallerAlive( Object caller ) throws CallerNotAliveException {
- if ( !checkAlive( caller ) ) {
+ if (checkAlive(caller)) {
throw new CallerNotAliveException( "Caller is not alive any more" );
}
}
public static Context getContext(Object object ) {
+ if( object == null){
+ return null;
+ }
if ( object instanceof Activity ) {
return ( Activity ) object;
} else if ( object instanceof Fragment ) {
diff --git a/gradle.properties b/gradle.properties
index e6236b6f23..893bf27e7d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -85,7 +85,7 @@ MOGO_LOCATION_VERSION=1.4.7.11
MOGO_TELEMATIC_VERSION=1.4.7.11
######## MogoAiCloudSDK Version ########
# 自研地图
-MAP_SDK_VERSION=2.14.1.2
+MAP_SDK_VERSION=2.14.1.5
MAP_SDK_OPERATION_VERSION=1.1.4.1
# websocket
WEBSOCKET_VERSION=1.1.7